diff --git a/Cargo.lock b/Cargo.lock index 9aedb8533d..5fc37734c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -371,7 +371,7 @@ dependencies = [ "nom", "pulldown-cmark", "semver", - "time 0.3.5", + "time", "toml_edit", ] @@ -390,9 +390,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3596addfb02dcdc06f5252ddda9f3785f9230f5827fb4284645240fa05ad92" +checksum = "67110a7844b75a4dda12f4dca5a731c961750d6c8fa3cb6a41ab67411be05d3a" dependencies = [ "serde", "serde_derive", @@ -429,19 +429,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time 0.1.43", - "winapi", -] - [[package]] name = "clap" version = "2.34.0" @@ -1126,9 +1113,9 @@ dependencies = [ [[package]] name = "git-conventional" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320bc4ceca39bbe9c90bf2eebea9c9e15e079db1e3bf45037bcccb75e56668c2" +checksum = "2e85b0054ddc3039f8c9dbf8c2235c51850bbcfe479b10ce61d951911001bb93" dependencies = [ "doc-comment", "nom", @@ -1194,7 +1181,7 @@ dependencies = [ "quick-error", "sha-1", "sha1", - "time 0.3.5", + "time", "walkdir", ] @@ -1902,6 +1889,15 @@ dependencies = [ "rayon", ] +[[package]] +name = "kstring" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526" +dependencies = [ + "serde", +] + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -2131,16 +2127,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.14" @@ -2437,7 +2423,7 @@ dependencies = [ "humantime", "log", "parking_lot", - "time 0.3.5", + "time", "tui", "tui-react", "unicode-segmentation", @@ -2929,16 +2915,6 @@ dependencies = [ "syn", ] -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "time" version = "0.3.5" @@ -2985,13 +2961,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.2.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbbdcf4f749dd33b1f1ea19b547bf789d87442ec40767d6015e5e2d39158d69a" +checksum = "c14e16aafed5fb7a1bdc293270ca28f17d0a09b4f528f8de34521f2a32d99198" dependencies = [ - "chrono", "combine", - "linked-hash-map", + "indexmap", + "itertools", + "kstring", ] [[package]] diff --git a/cargo-smart-release/Cargo.toml b/cargo-smart-release/Cargo.toml index 2129721de5..5fd536a7d0 100644 --- a/cargo-smart-release/Cargo.toml +++ b/cargo-smart-release/Cargo.toml @@ -32,12 +32,12 @@ clap = { version = "=3.0.0-rc.7", features = ["derive", "cargo"] } env_logger = { version = "0.9.0", default-features = false, features = ["humantime", "termcolor", "atty"] } cargo_metadata = "0.14.0" log = "0.4.14" -toml_edit = "0.2.1" +toml_edit = "0.12.0" semver = "1.0.4" crates-index = "0.17.0" -cargo_toml = "0.9.2" +cargo_toml = "0.10.2" nom = { version = "7", default-features = false, features = ["std"]} -git-conventional = "0.10.3" +git-conventional = "0.11.1" time = "0.3.2" pulldown-cmark = "0.8.0" bitflags = "1.3.2" diff --git a/cargo-smart-release/src/command/release/manifest.rs b/cargo-smart-release/src/command/release/manifest.rs index d9648ba887..e4444d4012 100644 --- a/cargo-smart-release/src/command/release/manifest.rs +++ b/cargo-smart-release/src/command/release/manifest.rs @@ -565,7 +565,7 @@ fn set_version_and_update_package_dependency( } } } - let new_manifest = doc.to_string_in_original_order(); + let new_manifest = doc.to_string(); out.write_all(new_manifest.as_bytes())?; Ok(manifest != new_manifest) diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md index 158056ed07..c84e76d1c1 100644 --- a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md +++ b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/a/CHANGELOG.md @@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
view details * **Uncategorized** - - initial (de05a2d) + - initial (0189fce)
## v0.8.0 (2021-09-09) diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/b/Cargo.toml b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/b/Cargo.toml index 14da2edda7..4f20ad0180 100644 --- a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/b/Cargo.toml +++ b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/b/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -a = { path = "../a", version ="^0.9.0"} +a = { path = "../a", version = "^0.9.0" } diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/c/Cargo.toml b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/c/Cargo.toml index 3482e768b3..b61d3e187e 100644 --- a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/c/Cargo.toml +++ b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released-force-bump/c/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -b = { path = "../b", version ="^0.9.0"} +b = { path = "../b", version = "^0.9.0" } diff --git a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/b/Cargo.toml b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/b/Cargo.toml index 6584383915..7a9657507f 100644 --- a/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/b/Cargo.toml +++ b/cargo-smart-release/tests/snapshots/triple-depth-workspace/crate-a-released/b/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -a = { path = "../a", version ="^0.8.0"} +a = { path = "../a", version = "^0.8.0" }