Renamed and merged crates

.github/workflows/publish.yml

@@ -49,13 +49,6 @@ jobs:
         run: cargo set-version "$(echo "${{ github.ref_name }}" | sed -e 's/^v//')"
 
       - name: Build and publish prdoclib
-        run: cargo publish -p prdoclib --token "${CRATESIO_TOKEN}"
-        env:
-          CRATESIO_TOKEN: ${{ secrets.CRATESIO_TOKEN }}
-
-      - name: Build and publish prdoc
-        # `set-version` will change Cargo.toml in `cli` package as it depends on `prdoclib`
-        # thus, we need --allow-dirty, to include uncommitted changes;
-        run: cargo publish --allow-dirty -p prdoc --token "${CRATESIO_TOKEN}"
+        run: cargo publish -p parity-prdoc --token "${CRATESIO_TOKEN}"
         env:
           CRATESIO_TOKEN: ${{ secrets.CRATESIO_TOKEN }}

Cargo.toml

@@ -1,4 +1,5 @@
-[workspace.package]
+[package]
+name = "parity-prdoc"
 version = "0.0.0-updated-from-ci"
 authors = ["chevdor <chevdor@gmail.com>", "Wilfried Kopp <wilfried@parity.io>", "Yuri Volkov <0@mcornholio.ru>"]
 edition = "2021"
@@ -7,16 +8,44 @@ keywords = ["cli", "documentation", "parity"]
 license = "MIT"
 repository = "https://github.com/paritytech/prdoc"
 
-[workspace]
-resolver = "2"
-members = [
-	"cli",
-	"prdoclib",
-]
+[lib]
+name = "prdoclib"
+path = "src/lib.rs"
+
+[[bin]]
+name = "prdoc"
 
 [profile.production]
 inherits = "release"
 lto = true
 panic = "abort"
 opt-level = "z"
 codegen-units = 1
+
+[dependencies]
+log = "0.4"
+regex = "1.10"
+exitcode = "1.1"
+thiserror = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = { version = "0.9", optional = false }
+serde_json = { version = "1.0", optional = false }
+valico = { version = "4.0", default-features = false, features = [] }
+toml = "0.8.19"
+assert_cmd = "2.0"
+color-eyre = "0.6"
+env_logger = "0.11"
+clap = { version = "4", features = [
+    "derive",
+    "env",
+    "unicode",
+    "cargo",
+    "color",
+    "help",
+    "usage",
+    "error-context",
+    "suggestions",
+] }
+
+[dev-dependencies]
+assert_cmd = "2.0"

cli/build.rs → build.rs

@@ -15,16 +15,16 @@ pub fn generate_cargo_key_build_date() {
 		Ok(o) if o.status.success() => {
 			let sha = String::from_utf8_lossy(&o.stdout).trim().to_owned();
 			Cow::from(sha)
-		}
+		},
 		Ok(o) => {
 			let status = o.status;
 			println!("cargo:warning=Failed fetching the date timestamp: {status}");
 			Cow::from("unknown")
-		}
+		},
 		Err(err) => {
 			println!("cargo:warning=Failed fetching the datge: {err}");
 			Cow::from("unknown")
-		}
+		},
 	};
 
 	println!("cargo:rustc-env=PRDOC_CLI_BUILD_DATE={build_date}");
@@ -38,16 +38,16 @@ pub fn generate_cargo_key_git() {
 			Ok(o) if o.status.success() => {
 				let tmsp = String::from_utf8_lossy(&o.stdout).trim().to_owned();
 				Cow::from(tmsp)
-			}
+			},
 			Ok(o) => {
 				let status = o.status;
 				println!("cargo:warning=Git command failed with status: {status}");
 				Cow::from("unknown")
-			}
+			},
 			Err(err) => {
 				println!("cargo:warning=Failed to execute git command: {err}");
 				Cow::from("unknown")
-			}
+			},
 		}
 	};