From 320c279f43218f07dc15852af137a1c11b18b52f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 1 Nov 2021 19:18:32 -0500 Subject: [PATCH] Port cargo from toml-rs to toml_edit Benefits: - A TOML 1.0 compliant parser - Unblock future work - Have `cargo init` add the current crate to the workspace, rather than error - #5586: Upstream `cargo-add` --- Cargo.toml | 2 +- benches/capture/Cargo.toml | 2 +- benches/capture/src/main.rs | 1 + crates/cargo-test-support/Cargo.toml | 2 +- crates/cargo-test-support/src/registry.rs | 2 +- src/cargo/core/manifest.rs | 1 + src/cargo/core/package.rs | 3 +- src/cargo/core/workspace.rs | 1 + src/cargo/ops/cargo_config.rs | 13 ++++--- src/cargo/ops/cargo_new.rs | 1 + src/cargo/ops/cargo_output_metadata.rs | 1 + .../ops/common_for_install_and_uninstall.rs | 1 + src/cargo/ops/lockfile.rs | 22 ++++++++---- src/cargo/ops/vendor.rs | 1 + src/cargo/util/config/key.rs | 2 +- src/cargo/util/config/mod.rs | 1 + src/cargo/util/config/target.rs | 1 + src/cargo/util/toml/mod.rs | 20 +++++++++-- tests/testsuite/bad_config.rs | 36 +++++++++++++++++-- tests/testsuite/build.rs | 21 +++++++++-- tests/testsuite/config.rs | 31 ++++++++++++---- tests/testsuite/config_cli.rs | 8 ++++- tests/testsuite/config_include.rs | 8 ++++- tests/testsuite/features_namespaced.rs | 2 ++ tests/testsuite/git.rs | 8 ++++- tests/testsuite/install.rs | 7 +++- tests/testsuite/install_upgrade.rs | 1 + tests/testsuite/login.rs | 1 + tests/testsuite/logout.rs | 1 + tests/testsuite/package.rs | 1 + tests/testsuite/patch.rs | 1 + tests/testsuite/publish.rs | 3 +- tests/testsuite/weak_dep_features.rs | 1 + tests/testsuite/workspaces.rs | 7 +++- 34 files changed, 176 insertions(+), 38 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21f0bfd49e6..b8660191bc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ strip-ansi-escapes = "0.1.0" tar = { version = "0.4.36", default-features = false } tempfile = "3.0" termcolor = "1.1" -toml = "0.5.7" +toml_edit = { version = "0.13", features = ["serde", "easy"] } unicode-xid = "0.2.0" url = "2.2.2" walkdir = "2.2" diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml index 38d57b288d7..5d124c34f3d 100644 --- a/benches/capture/Cargo.toml +++ b/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.35", default-features = false } -toml = "0.5.8" +toml_edit = { version = "0.9.1", features = ["easy"] } diff --git a/benches/capture/src/main.rs b/benches/capture/src/main.rs index f6f02c4ba05..8656c63c3ee 100644 --- a/benches/capture/src/main.rs +++ b/benches/capture/src/main.rs @@ -8,6 +8,7 @@ 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"); diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 7d57d9f02c7..8bafa221710 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -21,7 +21,7 @@ remove_dir_all = "0.5" serde_json = "1.0" tar = { version = "0.4.18", default-features = false } termcolor = "1.1.2" -toml = "0.5.7" +toml_edit = { version = "0.9.1", features = ["serde", "easy"] } url = "2.2.2" [features] diff --git a/crates/cargo-test-support/src/registry.rs b/crates/cargo-test-support/src/registry.rs index ecddf8eef65..8a219750f36 100644 --- a/crates/cargo-test-support/src/registry.rs +++ b/crates/cargo-test-support/src/registry.rs @@ -709,7 +709,7 @@ impl Package { if !self.cargo_features.is_empty() { manifest.push_str(&format!( "cargo-features = {}\n\n", - toml::to_string(&self.cargo_features).unwrap() + toml_edit::ser::to_item(&self.cargo_features).unwrap() )); } diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index b0bc0576a7a..4bf015619d3 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -9,6 +9,7 @@ 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::{CompileKind, CrateType}; diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index c447610f2c9..0ebe0277e78 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -16,6 +16,7 @@ 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; @@ -199,7 +200,7 @@ impl Package { .manifest() .original() .prepare_for_publish(ws, self.root())?; - let toml = toml::to_string(&manifest)?; + let toml = toml::to_string_pretty(&manifest)?; Ok(format!("{}\n{}", MANIFEST_PREAMBLE, toml)) } diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index a5b1de06496..046f0b60671 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -8,6 +8,7 @@ use 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::features::Features; diff --git a/src/cargo/ops/cargo_config.rs b/src/cargo/ops/cargo_config.rs index e84e84edf0d..99d3baf7f50 100644 --- a/src/cargo/ops/cargo_config.rs +++ b/src/cargo/ops/cargo_config.rs @@ -127,19 +127,24 @@ fn print_toml(config: &Config, opts: &GetOptions<'_>, key: &ConfigKey, cv: &CV) config, "{} = {}{}", key, - toml::to_string(&val).unwrap(), + toml_edit::Value::from(val), origin(def) ), CV::List(vals, _def) => { if opts.show_origin { drop_println!(config, "{} = [", key); for (val, def) in vals { - drop_println!(config, " {}, # {}", toml::to_string(&val).unwrap(), def); + drop_println!( + config, + " {}, # {}", + toml_edit::ser::to_item(&val).unwrap(), + def + ); } drop_println!(config, "]"); } else { - let vals: Vec<&String> = vals.iter().map(|x| &x.0).collect(); - drop_println!(config, "{} = {}", key, toml::to_string(&vals).unwrap()); + let vals: toml_edit::Array = vals.iter().map(|x| &x.0).collect(); + drop_println!(config, "{} = {}", key, vals); } } CV::Table(table, _def) => { diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index 2011428099a..85d8beaf770 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -12,6 +12,7 @@ use std::io::{BufRead, BufReader, ErrorKind}; use std::path::{Path, PathBuf}; use std::process::Command; use std::str::{from_utf8, FromStr}; +use toml_edit::easy as toml; #[derive(Clone, Copy, Debug, PartialEq)] pub enum VersionControl { diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs index 8cb3951dd4d..1bc26c68942 100644 --- a/src/cargo/ops/cargo_output_metadata.rs +++ b/src/cargo/ops/cargo_output_metadata.rs @@ -10,6 +10,7 @@ use cargo_platform::Platform; use serde::Serialize; use std::collections::BTreeMap; use std::path::PathBuf; +use toml_edit::easy as toml; const VERSION: u32 = 1; diff --git a/src/cargo/ops/common_for_install_and_uninstall.rs b/src/cargo/ops/common_for_install_and_uninstall.rs index 444e57cfddb..a529e19e7e1 100644 --- a/src/cargo/ops/common_for_install_and_uninstall.rs +++ b/src/cargo/ops/common_for_install_and_uninstall.rs @@ -7,6 +7,7 @@ use std::rc::Rc; use anyhow::{bail, format_err, Context as _}; use serde::{Deserialize, Serialize}; +use toml_edit::easy as toml; use crate::core::compiler::Freshness; use crate::core::{Dependency, FeatureValue, Package, PackageId, Source, SourceId}; diff --git a/src/cargo/ops/lockfile.rs b/src/cargo/ops/lockfile.rs index ec0255ff479..8743520ad0c 100644 --- a/src/cargo/ops/lockfile.rs +++ b/src/cargo/ops/lockfile.rs @@ -6,6 +6,7 @@ use crate::util::toml as cargo_toml; use crate::util::Filesystem; use anyhow::Context as _; +use toml_edit::easy as toml; pub fn load_pkg_lockfile(ws: &Workspace<'_>) -> CargoResult> { if !ws.root().join("Cargo.lock").exists() { @@ -100,7 +101,7 @@ fn resolve_to_string_orig( } fn serialize_resolve(resolve: &Resolve, orig: Option<&str>) -> String { - let toml = toml::Value::try_from(resolve).unwrap(); + let toml = toml_edit::ser::to_item(resolve).unwrap(); let mut out = String::new(); @@ -139,7 +140,7 @@ fn serialize_resolve(resolve: &Resolve, orig: Option<&str>) -> String { let deps = toml["package"].as_array().unwrap(); for dep in deps { - let dep = dep.as_table().unwrap(); + let dep = dep.as_inline_table().unwrap(); out.push_str("[[package]]\n"); emit_package(dep, &mut out); @@ -149,14 +150,23 @@ fn serialize_resolve(resolve: &Resolve, orig: Option<&str>) -> String { let list = patch["unused"].as_array().unwrap(); for entry in list { out.push_str("[[patch.unused]]\n"); - emit_package(entry.as_table().unwrap(), &mut out); + emit_package(entry.as_inline_table().unwrap(), &mut out); out.push('\n'); } } if let Some(meta) = toml.get("metadata") { - out.push_str("[metadata]\n"); - out.push_str(&meta.to_string()); + // 1. We need to ensure we print the entire tree, not just the direct members of `metadata` + // (which `toml_edit::Table::to_string` only shows) + // 2. We need to ensure all children tables have `metadata.` prefix + let meta_table = meta + .clone() + .into_table() + .expect("validation ensures this is a table"); + let mut meta_doc = toml_edit::Document::new(); + meta_doc["metadata"] = toml_edit::Item::Table(meta_table); + + out.push_str(&meta_doc.to_string()); } // Historical versions of Cargo in the old format accidentally left trailing @@ -190,7 +200,7 @@ fn are_equal_lockfiles(orig: &str, current: &str, ws: &Workspace<'_>) -> bool { orig.lines().eq(current.lines()) } -fn emit_package(dep: &toml::value::Table, out: &mut String) { +fn emit_package(dep: &toml_edit::InlineTable, out: &mut String) { out.push_str(&format!("name = {}\n", &dep["name"])); out.push_str(&format!("version = {}\n", &dep["version"])); diff --git a/src/cargo/ops/vendor.rs b/src/cargo/ops/vendor.rs index 8ecb802d7b8..eb1d8f63637 100644 --- a/src/cargo/ops/vendor.rs +++ b/src/cargo/ops/vendor.rs @@ -12,6 +12,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap}; use std::fs::{self, File, OpenOptions}; use std::io::{Read, Write}; use std::path::{Path, PathBuf}; +use toml_edit::easy as toml; pub struct VendorOptions<'a> { pub no_delete: bool, diff --git a/src/cargo/util/config/key.rs b/src/cargo/util/config/key.rs index 4ac119174a7..181b7c56a9f 100644 --- a/src/cargo/util/config/key.rs +++ b/src/cargo/util/config/key.rs @@ -111,6 +111,6 @@ fn escape_key_part<'a>(part: &'a str) -> Cow<'a, str> { Cow::Borrowed(part) } else { // This is a bit messy, but toml doesn't expose a function to do this. - Cow::Owned(toml::to_string(&toml::Value::String(part.to_string())).unwrap()) + Cow::Owned(toml_edit::Value::from(part).to_string()) } } diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs index fdf981f051f..22cbc198d76 100644 --- a/src/cargo/util/config/mod.rs +++ b/src/cargo/util/config/mod.rs @@ -79,6 +79,7 @@ use cargo_util::paths; use curl::easy::Easy; use lazycell::LazyCell; use serde::Deserialize; +use toml_edit::easy as toml; use url::Url; mod de; diff --git a/src/cargo/util/config/target.rs b/src/cargo/util/config/target.rs index d259b970633..dac2e55b5ba 100644 --- a/src/cargo/util/config/target.rs +++ b/src/cargo/util/config/target.rs @@ -4,6 +4,7 @@ use crate::util::CargoResult; use serde::Deserialize; use std::collections::{BTreeMap, HashMap}; use std::path::PathBuf; +use toml_edit::easy as toml; /// Config definition of a `[target.'cfg(…)']` table. /// diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index d973930c73e..217f7ce114e 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -13,6 +13,7 @@ use semver::{self, VersionReq}; use serde::de; use serde::ser; use serde::{Deserialize, Serialize}; +use toml_edit::easy as toml; use url::Url; use crate::core::compiler::{CompileKind, CompileTarget}; @@ -77,16 +78,21 @@ pub fn read_manifest_from_str( let pretty_filename = manifest_file .strip_prefix(config.cwd()) .unwrap_or(manifest_file); - parse(contents, pretty_filename, config)? + parse_document(contents, pretty_filename, config)? }; // Provide a helpful error message for a common user error. if let Some(package) = toml.get("package").or_else(|| toml.get("project")) { if let Some(feats) = package.get("cargo-features") { + let mut feats = feats.clone(); + if let Some(value) = feats.as_value_mut() { + // Only keep formatting inside of the `[]` and not formatting around it + value.decor_mut().clear(); + } bail!( "cargo-features = {} was found in the wrong location: it \ should be set at the top of Cargo.toml before any tables", - toml::to_string(feats).unwrap() + feats.to_string() ); } } @@ -164,6 +170,16 @@ pub fn parse(toml: &str, _file: &Path, _config: &Config) -> CargoResult CargoResult { + // At the moment, no compatibility checks are needed. + toml.parse() + .map_err(|e| anyhow::Error::from(e).context("could not parse input as TOML")) +} + type TomlLibTarget = TomlTarget; type TomlBinTarget = TomlTarget; type TomlExampleTarget = TomlTarget; diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index ef06da3e3ac..06f9b449b26 100644 --- a/tests/testsuite/bad_config.rs +++ b/tests/testsuite/bad_config.rs @@ -196,7 +196,12 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1 column 2 + TOML parse error at line 1, column 2 + | + 1 | 4 + | ^ + Unexpected end of input + Expected `.` or `=` ", ) .run(); @@ -442,7 +447,13 @@ Caused by: could not parse input as TOML Caused by: - expected a table key, found a newline at line 8 column 27 + TOML parse error at line 8, column 27 + | + 8 | native = { + | ^ + Unexpected ` + ` + Expected key ", ) .run(); @@ -781,7 +792,26 @@ fn invalid_toml_historically_allowed_fails() { p.cargo("build") .with_status(101) - .with_stderr_contains(" expected newline, found an identifier at line 1 column 7") + .with_stderr( + "\ +error: could not load Cargo configuration + +Caused by: + could not parse TOML configuration in `[..]` + +Caused by: + could not parse input as TOML + +Caused by: + TOML parse error at line 1, column 7 + | + 1 | [bar] baz = 2 + | ^ + Unexpected `b` + Expected newline or end of input + While parsing a Table Header +", + ) .run(); } diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 474a7457530..8927d6a6c69 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -198,7 +198,12 @@ Caused by: could not parse input as TOML Caused by: - invalid TOML value, did you mean to use a quoted string? at line 3 column 23 + TOML parse error at line 3, column 23 + | + 3 | foo = bar + | ^ + Unexpected `b` + Expected quoted string ", ) .run(); @@ -218,7 +223,12 @@ Caused by: could not parse input as TOML Caused by: - invalid TOML value, did you mean to use a quoted string? at line 1 column 5 + TOML parse error at line 1, column 5 + | + 1 | a = bar + | ^ + Unexpected `b` + Expected quoted string ", ) .run(); @@ -2740,7 +2750,12 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found an identifier at line 1 column 6 + TOML parse error at line 1, column 6 + | + 1 | this is not valid toml + | ^ + Unexpected `i` + Expected `.` or `=` ", ) .run(); diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs index 95549cfc387..c3c61a868ea 100644 --- a/tests/testsuite/config.rs +++ b/tests/testsuite/config.rs @@ -700,7 +700,12 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1 column 5", + TOML parse error at line 1, column 5 + | +1 | asdf + | ^ +Unexpected end of input +Expected `.` or `=`", ); } @@ -769,8 +774,14 @@ expected a list, but found a integer for `l3` in [..]/.cargo/config", // "invalid number" here isn't the best error, but I think it's just toml.rs. assert_error( config.get::("bad-env").unwrap_err(), - "error in environment variable `CARGO_BAD_ENV`: \ - could not parse TOML list: invalid TOML value, did you mean to use a quoted string? at line 1 column 8", + "\ +error in environment variable `CARGO_BAD_ENV`: could not parse TOML list: TOML parse error at line 1, column 8 + | +1 | value=[zzz] + | ^ +Unexpected `z` +Expected newline or `#` +", ); // Try some other sequence-like types. @@ -1059,7 +1070,13 @@ Caused by: could not parse input as TOML Caused by: - dotted key attempted to extend non-table type at line 2 column 15", + TOML parse error at line 3, column 1 + | +3 | ssl-version.min = 'tlsv1.2' + | ^ +Dotted key `ssl-version` attempted to extend non-table type (string) + +", ); assert!(config .get::>("http.ssl-version") @@ -1494,8 +1511,8 @@ fn all_profile_options() { package: Some(overrides), ..base_settings }; - let profile_toml = ::toml::to_string(&profile).unwrap(); - let roundtrip: toml::TomlProfile = ::toml::from_str(&profile_toml).unwrap(); - let roundtrip_toml = ::toml::to_string(&roundtrip).unwrap(); + let profile_toml = toml_edit::easy::to_string(&profile).unwrap(); + let roundtrip: toml::TomlProfile = toml_edit::easy::from_str(&profile_toml).unwrap(); + let roundtrip_toml = toml_edit::easy::to_string(&roundtrip).unwrap(); compare::assert_match_exact(&profile_toml, &roundtrip_toml); } diff --git a/tests/testsuite/config_cli.rs b/tests/testsuite/config_cli.rs index 745525012eb..8cc5d1dd4df 100644 --- a/tests/testsuite/config_cli.rs +++ b/tests/testsuite/config_cli.rs @@ -287,7 +287,13 @@ fn bad_parse() { failed to parse --config argument `abc` Caused by: - expected an equals, found eof at line 1 column 4", + TOML parse error at line 1, column 4 + | +1 | abc + | ^ +Unexpected end of input +Expected `.` or `=` +", ); } diff --git a/tests/testsuite/config_include.rs b/tests/testsuite/config_include.rs index aff2a78afd8..349e0dce467 100644 --- a/tests/testsuite/config_include.rs +++ b/tests/testsuite/config_include.rs @@ -277,6 +277,12 @@ fn cli_path() { failed to parse --config argument `missing.toml` Caused by: - expected an equals, found eof at line 1 column 13", + TOML parse error at line 1, column 13 + | +1 | missing.toml + | ^ +Unexpected end of input +Expected `.` or `=` +", ); } diff --git a/tests/testsuite/features_namespaced.rs b/tests/testsuite/features_namespaced.rs index 78cdc2b1510..da77906a295 100644 --- a/tests/testsuite/features_namespaced.rs +++ b/tests/testsuite/features_namespaced.rs @@ -950,6 +950,7 @@ version = "0.1.0" description = "foo" homepage = "https://example.com/" license = "MIT" + [dependencies.opt-dep1] version = "1.0" optional = true @@ -1056,6 +1057,7 @@ version = "0.1.0" description = "foo" homepage = "https://example.com/" license = "MIT" + [dependencies.bar] version = "1.0" optional = true diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 293c5db1857..4db0f6ed6d5 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -2439,7 +2439,13 @@ Caused by: could not parse input as TOML Caused by: - duplicate key: `categories` for key `project` at line 10 column 21", + TOML parse error at line 8, column 21 + | + 8 | categories = [\"algorithms\"] + | ^ + Duplicate key `categories` in table `project` + +", path2url(&git_root), path2url(&git_root), )) diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index b28b3743c23..c4a63edb39f 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -924,7 +924,12 @@ Caused by: invalid TOML found for metadata Caused by: - unexpected character[..] + TOML parse error at line 1, column 1 + | + 1 | [..] = { \"foo 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)\" = [\"foo[EXE]\"] } + | ^ + Unexpected `[..]` + Expected key or end of input ", ) .run(); diff --git a/tests/testsuite/install_upgrade.rs b/tests/testsuite/install_upgrade.rs index 1a18bc211e7..a1e69f5143a 100644 --- a/tests/testsuite/install_upgrade.rs +++ b/tests/testsuite/install_upgrade.rs @@ -6,6 +6,7 @@ use std::env; use std::fs; use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; +use toml_edit::easy as toml; use cargo_test_support::install::{cargo_home, exe}; use cargo_test_support::paths::CargoPathExt; diff --git a/tests/testsuite/login.rs b/tests/testsuite/login.rs index b69616ff81b..14def0d50e3 100644 --- a/tests/testsuite/login.rs +++ b/tests/testsuite/login.rs @@ -6,6 +6,7 @@ use cargo_test_support::{cargo_process, paths, t}; use std::fs::{self, OpenOptions}; use std::io::prelude::*; use std::path::PathBuf; +use toml_edit::easy as toml; const TOKEN: &str = "test-token"; const TOKEN2: &str = "test-token2"; diff --git a/tests/testsuite/logout.rs b/tests/testsuite/logout.rs index 606a06c8484..d491ede13bf 100644 --- a/tests/testsuite/logout.rs +++ b/tests/testsuite/logout.rs @@ -3,6 +3,7 @@ use cargo_test_support::install::cargo_home; use cargo_test_support::{cargo_process, registry}; use std::fs; +use toml_edit::easy as toml; #[cargo_test] fn gated() { diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 054189a08e9..071b6fdd9d2 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -1005,6 +1005,7 @@ license = "MIT" [package.metadata] foo = "bar" + [dependencies.abc] version = "1.0" diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs index 28b5fbfe075..ca10815b330 100644 --- a/tests/testsuite/patch.rs +++ b/tests/testsuite/patch.rs @@ -5,6 +5,7 @@ use cargo_test_support::paths; use cargo_test_support::registry::{self, Package}; use cargo_test_support::{basic_manifest, project}; use std::fs; +use toml_edit::easy as toml; #[cargo_test] fn replace() { diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs index 8085259fb2c..f5f85cd94b9 100644 --- a/tests/testsuite/publish.rs +++ b/tests/testsuite/publish.rs @@ -1178,6 +1178,7 @@ fn publish_git_with_version() { authors = []\n\ description = \"foo\"\n\ license = \"MIT\"\n\ + \n\ [dependencies.dep1]\n\ version = \"1.0\"\n\ ", @@ -1283,8 +1284,6 @@ homepage = "foo" documentation = "foo" license = "MIT" repository = "foo" - -[dev-dependencies] "#, cargo::core::package::MANIFEST_PREAMBLE ), diff --git a/tests/testsuite/weak_dep_features.rs b/tests/testsuite/weak_dep_features.rs index 6d7d8857dd0..07d86470081 100644 --- a/tests/testsuite/weak_dep_features.rs +++ b/tests/testsuite/weak_dep_features.rs @@ -608,6 +608,7 @@ version = "0.1.0" description = "foo" homepage = "https://example.com/" license = "MIT" + [dependencies.bar] version = "1.0" optional = true diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index 777c6d13af5..9b12e5c6013 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -1065,7 +1065,12 @@ Caused by: could not parse input as TOML Caused by: - expected an equals, found eof at line 1 column 5 + TOML parse error at line 1, column 5 + | + 1 | asdf + | ^ + Unexpected end of input + Expected `.` or `=` Created binary (application) `bar` package ", )