perf: Update toml

Author: epage

Cargo.lock

@@ -105,8 +105,8 @@ tar = { version = "0.4.44", default-features = false }
 tempfile = "3.20.0"
 thiserror = "2.0.12"
 time = { version = "0.3.41", features = ["parsing", "formatting", "serde"] }
-toml = { version = "0.8.23", default-features = false }
-toml_edit = { version = "0.22.27", features = ["serde"] }
+toml = { version = "0.9.0", default-features = false }
+toml_edit = { version = "0.23.0", features = ["serde"] }
 tracing = { version = "0.1.41", default-features = false, features = ["std"] } # be compatible with rustc_log: https://github.com/rust-lang/rust/blob/e51e98dde6a/compiler/rustc_log/Cargo.toml#L9
 tracing-chrome = "0.7.2"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
@@ -211,7 +211,7 @@ tar.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 time.workspace = true
-toml = { workspace = true, features = ["display", "parse"] }
+toml = { workspace = true, features = ["std", "serde", "parse", "display"] }
 toml_edit.workspace = true
 tracing = { workspace = true, features = ["attributes"] }
 tracing-subscriber.workspace = true

Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 cargo_metadata.workspace = true
 flate2.workspace = true
 tar.workspace = true
-toml = { workspace = true, features = ["display", "parse"] }
+toml = { workspace = true, features = ["display", "parse", "serde"] }
 
 [lints]
 workspace = true

benches/capture/Cargo.toml

@@ -27,7 +27,7 @@ serde_json.workspace = true
 snapbox.workspace = true
 tar.workspace = true
 time.workspace = true
-toml = { workspace = true, features = ["display"] }
+toml = { workspace = true, features = ["display", "serde"] }
 url.workspace = true
 walkdir.workspace = true
 

crates/cargo-test-support/Cargo.toml

@@ -16,7 +16,7 @@ serde_json = { workspace = true, optional = true }
 serde-untagged.workspace = true
 serde-value.workspace = true
 thiserror.workspace = true
-toml.workspace = true
+toml = { workspace = true, features = ["serde"] }
 unicode-xid.workspace = true
 url.workspace = true
 

crates/cargo-util-schemas/Cargo.toml

@@ -1043,10 +1043,9 @@ impl GlobalContext {
         let def = Definition::Environment(key.as_env_key().to_string());
         if self.cli_unstable().advanced_env && env_val.starts_with('[') && env_val.ends_with(']') {
             // Parse an environment string as a TOML array.
-            let toml_v = toml::Value::deserialize(toml::de::ValueDeserializer::new(&env_val))
-                .map_err(|e| {
-                    ConfigError::new(format!("could not parse TOML list: {}", e), def.clone())
-                })?;
+            let toml_v = env_val.parse::<toml::Value>().map_err(|e| {
+                ConfigError::new(format!("could not parse TOML list: {}", e), def.clone())
+            })?;
             let values = toml_v.as_array().expect("env var was not array");
             for value in values {
                 // TODO: support other types.

src/cargo/util/context/mod.rs

@@ -751,13 +751,11 @@ fn bad_registry_name() {
 [ERROR] invalid character ` ` in registry name: `bad name`, characters must be Unicode XID characters (numbers, `-`, `_`, or most letters)
 
 
-  --> Cargo.toml:8:17
-   |
- 8 | /                 [dependencies.bar]
- 9 | |                 version = "0.0.1"
-10 | |                 registry = "bad name"
-   | |_____________________________________^
-   |
+ --> Cargo.toml:8:17
+  |
+8 |                 [dependencies.bar]
+  |                 ^^^^^^^^^^^^^^^^^^
+  |
 
 "#]])
         .run();

tests/testsuite/alt_registry.rs

@@ -172,7 +172,7 @@ Caused by:
     |
   1 | 4
     |  ^
-  expected `.`, `=`
+  key with no value, expected `=`
 
 "#]])
         .run();
@@ -454,8 +454,7 @@ fn malformed_override() {
     p.cargo("check")
         .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] invalid inline table
-expected `}`
+[ERROR] newlines are unsupported in inline tables, expected nothing
  --> Cargo.toml:9:27
   |
 9 |                 native = {
@@ -2130,8 +2129,7 @@ Caused by:
     |
   1 | [bar] baz = 2
     |       ^
-  invalid table header
-  expected newline, `#`
+  unexpected key or value, expected newline, `#`
 
 "#]])
         .run();

tests/testsuite/bad_config.rs

@@ -377,11 +377,11 @@ Caused by:
   could not parse TOML configuration in `[ROOT]/foo/.cargo/config.toml`
 
 Caused by:
-  TOML parse error at line 1, column 1
+  TOML parse error at line 1, column 2
     |
   1 | !
-    | ^
-  invalid key
+    |  ^
+  key with no value, expected `=`
 
 "#]])
         .run();
@@ -418,12 +418,11 @@ fn cargo_compile_with_invalid_manifest2() {
     p.cargo("build")
         .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] invalid string
-expected `"`, `'`
+[ERROR] string values must be quoted, expected literal string
  --> Cargo.toml:3:23
   |
 3 |                 foo = bar
-  |                       ^
+  |                       ^^^
   |
 
 "#]])
@@ -437,12 +436,11 @@ fn cargo_compile_with_invalid_manifest3() {
     p.cargo("build --manifest-path src/Cargo.toml")
         .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] invalid string
-expected `"`, `'`
+[ERROR] string values must be quoted, expected literal string
  --> src/Cargo.toml:1:5
   |
 1 | a = bar
-  |     ^
+  |     ^^^
   |
 
 "#]])
@@ -2740,7 +2738,7 @@ Caused by:
     |
   1 | this is not valid toml
     |      ^
-  expected `.`, `=`
+  key with no value, expected `=`
 
 "#]])
         .run();