Auto merge of #11618 - epage:toml, r=ehuss

chore: Update to toml v0.6, toml_edit v0.18

`toml` replaces `toml_edit::easy`, using `toml_edit` as its parser.

Author: bors

Cargo.toml

@@ -66,7 +66,8 @@ tar = { version = "0.4.38", default-features = false }
 tempfile = "3.0"
 termcolor = "1.1"
 time = { version = "0.3", features = ["parsing", "formatting"]}
-toml_edit =  { version = "0.15.0", features = ["serde", "easy", "perf"] }
+toml_edit = "0.19.0"
+toml = "0.7.0"
 unicode-xid = "0.2.0"
 url = "2.2.2"
 walkdir = "2.2"

benches/capture/Cargo.toml

@@ -9,4 +9,4 @@ description = "Tool for capturing a real-world workspace for benchmarking."
 cargo_metadata = "0.14.0"
 flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
 tar = { version = "0.4.38", default-features = false }
-toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] }
+toml = "0.7.0"

benches/capture/src/main.rs

@@ -8,7 +8,6 @@ use flate2::{Compression, GzBuilder};
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use toml_edit::easy as toml;
 
 fn main() {
     let force = std::env::args().any(|arg| arg == "-f");

crates/cargo-test-support/Cargo.toml

@@ -25,7 +25,7 @@ serde = { version = "1.0.123", features = ["derive"] }
 serde_json = "1.0"
 tar = { version = "0.4.38", default-features = false }
 termcolor = "1.1.2"
-toml_edit = { version = "0.15.0", features = ["serde", "easy", "perf"] }
+toml = "0.7.0"
 url = "2.2.2"
 
 [target.'cfg(windows)'.dependencies]

crates/cargo-test-support/src/registry.rs

@@ -1391,10 +1391,13 @@ impl Package {
         let mut manifest = String::new();
 
         if !self.cargo_features.is_empty() {
-            manifest.push_str(&format!(
-                "cargo-features = {}\n\n",
-                toml_edit::ser::to_item(&self.cargo_features).unwrap()
-            ));
+            let mut features = String::new();
+            serde::Serialize::serialize(
+                &self.cargo_features,
+                toml::ser::ValueSerializer::new(&mut features),
+            )
+            .unwrap();
+            manifest.push_str(&format!("cargo-features = {}\n\n", features));
         }
 
         manifest.push_str(&format!(

src/cargo/core/manifest.rs

@@ -9,7 +9,6 @@ use anyhow::Context as _;
 use semver::Version;
 use serde::ser;
 use serde::Serialize;
-use toml_edit::easy as toml;
 use url::Url;
 
 use crate::core::compiler::rustdoc::RustdocScrapeExamples;

src/cargo/core/package.rs

@@ -16,7 +16,6 @@ use lazycell::LazyCell;
 use log::{debug, warn};
 use semver::Version;
 use serde::Serialize;
-use toml_edit::easy as toml;
 
 use crate::core::compiler::{CompileKind, RustcTargetData};
 use crate::core::dependency::DepKind;

src/cargo/core/workspace.rs

@@ -8,7 +8,6 @@ use anyhow::{anyhow, bail, Context as _};
 use glob::glob;
 use itertools::Itertools;
 use log::debug;
-use toml_edit::easy as toml;
 use url::Url;
 
 use crate::core::compiler::Unit;

src/cargo/ops/cargo_config.rs

@@ -137,7 +137,8 @@ fn print_toml(config: &Config, opts: &GetOptions<'_>, key: &ConfigKey, cv: &CV)
                     drop_println!(
                         config,
                         "    {}, # {}",
-                        toml_edit::ser::to_item(&val).unwrap(),
+                        serde::Serialize::serialize(val, toml_edit::ser::ValueSerializer::new())
+                            .unwrap(),
                         def
                     );
                 }

src/cargo/ops/cargo_new.rs

@@ -12,7 +12,6 @@ use std::io::{BufRead, BufReader, ErrorKind};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::{fmt, slice};
-use toml_edit::easy as toml;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum VersionControl {