fix(add): Add back in some auto-formatting

This moves the auto-format to the correct place so it takes effect.
rust-lang · Oct 17, 2023 · 956fa58 · 956fa58
1 parent 15ff2db
commit 956fa58
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/src/cargo/util/toml_mut/manifest.rs b/src/cargo/util/toml_mut/manifest.rs
@@ -349,13 +349,16 @@ impl LocalManifest {
             .get_key_value_mut(dep_key)
         {
             dep.update_toml(&crate_root, &mut dep_key, dep_item);
+            if let Some(table) = dep_item.as_inline_table_mut() {
+                // So long as we don't have `Cargo.toml` auto-formatting and inline-tables can only
+                // be on one line, there isn't really much in the way of interesting formatting to
+                // include (no comments), so let's just wipe it clean
+                table.fmt();
+            }
         } else {
             let new_dependency = dep.to_toml(&crate_root);
             table[dep_key] = new_dependency;
         }
-        if let Some(t) = table.as_inline_table_mut() {
-            t.fmt()
-        }
 
         Ok(())
     }

diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_git_with_path/out/primary/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-cargo-list-test-fixture-dependency = { optional = true , path = "../dependency", version = "0.0.0" }
+cargo-list-test-fixture-dependency = { optional = true, path = "../dependency", version = "0.0.0" }
diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/out/Cargo.toml
@@ -5,5 +5,5 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-my-package1 = { version = "99999.0.0"}
-my-package2 = { version = "0.4.1"}
+my-package1 = { version = "99999.0.0" }
+my-package2 = { version = "0.4.1" }
diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml
@@ -9,5 +9,5 @@ default = []
 other = ["your-face/nose"]
 
 [dependencies]
-your-face = { version = "99999.0.0"}
-my-package2 = { version = "0.4.1"}
+your-face = { version = "99999.0.0" }
+my-package2 = { version = "0.4.1" }
diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-your-face={version="99999.0.0",features=["eyes", "nose"]}  # Hello world
+your-face={ version = "99999.0.0", features = ["eyes", "nose"] }  # Hello world
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_version_with_git/out/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-versioned-package = { version = "0.3.0", optional = true , git = "[ROOTURL]/versioned-package" }
+versioned-package = { version = "0.3.0", optional = true, git = "[ROOTURL]/versioned-package" }
diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_version_with_path/out/primary/Cargo.toml
@@ -5,4 +5,4 @@ name = "cargo-list-test-fixture"
 version = "0.0.0"
 
 [dependencies]
-cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true , path = "../dependency" }
+cargo-list-test-fixture-dependency = { version = "0.0.0", optional = true, path = "../dependency" }
diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml b/tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
@@ -3,4 +3,4 @@ name = "bar"
 version = "0.0.0"
 
 [dependencies]
-foo = { features = ["test"] , path = "../dependency", version = "0.0.0" }
+foo = { features = ["test"], path = "../dependency", version = "0.0.0" }
diff --git a/tests/testsuite/cargo_add/preserve_features_table/out/Cargo.toml b/tests/testsuite/cargo_add/preserve_features_table/out/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-your-face = { version = "99999.0.0"}
+your-face = { version = "99999.0.0" }
 
 [features]
 default = [

diff --git a/tests/testsuite/cargo_add/require_weak/out/Cargo.toml b/tests/testsuite/cargo_add/require_weak/out/Cargo.toml
@@ -8,4 +8,4 @@ version = "0.0.0"
 eyes = ["your-face/eyes"]
 
 [dependencies]
-your-face = { version = "99999.0.0"}
+your-face = { version = "99999.0.0" }