Skip to content

Commit 956fa58

Browse files
committed
fix(add): Add back in some auto-formatting
This moves the auto-format to the correct place so it takes effect.
1 parent 15ff2db commit 956fa58

File tree

10 files changed

+17
-14
lines changed

10 files changed

+17
-14
lines changed

src/cargo/util/toml_mut/manifest.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,16 @@ impl LocalManifest {
349349
.get_key_value_mut(dep_key)
350350
{
351351
dep.update_toml(&crate_root, &mut dep_key, dep_item);
352+
if let Some(table) = dep_item.as_inline_table_mut() {
353+
// So long as we don't have `Cargo.toml` auto-formatting and inline-tables can only
354+
// be on one line, there isn't really much in the way of interesting formatting to
355+
// include (no comments), so let's just wipe it clean
356+
table.fmt();
357+
}
352358
} else {
353359
let new_dependency = dep.to_toml(&crate_root);
354360
table[dep_key] = new_dependency;
355361
}
356-
if let Some(t) = table.as_inline_table_mut() {
357-
t.fmt()
358-
}
359362

360363
Ok(())
361364
}

tests/testsuite/cargo_add/overwrite_git_with_path/out/primary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
55
version = "0.0.0"
66

77
[dependencies]
8-
cargo-list-test-fixture-dependency = { optional = true , path = "../dependency", version = "0.0.0" }
8+
cargo-list-test-fixture-dependency = { optional = true, path = "../dependency", version = "0.0.0" }

tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/out/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ name = "cargo-list-test-fixture"
55
version = "0.0.0"
66

77
[dependencies]
8-
my-package1 = { version = "99999.0.0"}
9-
my-package2 = { version = "0.4.1"}
8+
my-package1 = { version = "99999.0.0" }
9+
my-package2 = { version = "0.4.1" }

tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ default = []
99
other = ["your-face/nose"]
1010

1111
[dependencies]
12-
your-face = { version = "99999.0.0"}
13-
my-package2 = { version = "0.4.1"}
12+
your-face = { version = "99999.0.0" }
13+
my-package2 = { version = "0.4.1" }

tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
55
version = "0.0.0"
66

77
[dependencies]
8-
your-face={version="99999.0.0",features=["eyes", "nose"]} # Hello world
8+
your-face={ version = "99999.0.0", features = ["eyes", "nose"] } # Hello world

tests/testsuite/cargo_add/overwrite_version_with_git/out/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
55
version = "0.0.0"
66

77
[dependencies]
8-
versioned-package = { version = "0.3.0", optional = true , git = "[ROOTURL]/versioned-package" }
8+
versioned-package = { version = "0.3.0", optional = true, git = "[ROOTURL]/versioned-package" }

tests/testsuite/cargo_add/overwrite_version_with_path/out/primary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
55
version = "0.0.0"
66

77
[dependencies]
8-
cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true , path = "../dependency" }
8+
cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true, path = "../dependency" }

tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ name = "bar"
33
version = "0.0.0"
44

55
[dependencies]
6-
foo = { features = ["test"] , path = "../dependency", version = "0.0.0" }
6+
foo = { features = ["test"], path = "../dependency", version = "0.0.0" }

tests/testsuite/cargo_add/preserve_features_table/out/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
your-face = { version = "99999.0.0"}
9+
your-face = { version = "99999.0.0" }
1010

1111
[features]
1212
default = [

tests/testsuite/cargo_add/require_weak/out/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ version = "0.0.0"
88
eyes = ["your-face/eyes"]
99

1010
[dependencies]
11-
your-face = { version = "99999.0.0"}
11+
your-face = { version = "99999.0.0" }

0 commit comments

Comments
 (0)