itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #13963 - epage:snapbox, r=weihanglo

Browse Source 
chore: Update to snapbox 0.6

### What does this PR try to resolve?

This unblocks regex redactions which will help with `Finished in 3.45s` messages as well as maybe switching away from `compare.rs` generally.

### How should we test and review this PR?

### Additional information
This commit is contained in:
bors 2024-05-28 03:48:38 +00:00
commit 11d0002ea0
284 changed files with 618 additions and 613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -344,7 +344,7 @@ dependencies = [
[[package]] [[package]]
name = "cargo-credential" name = "cargo-credential"
version = "0.4.5" version = "0.4.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"libc", "libc",
@ -3208,9 +3208,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "snapbox" name = "snapbox"
version = "0.5.9" version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ac441e1ecf678f68423d47f376d53fabce1afba92c8f68e31508eb27df8562a" checksum = "9ad8c7be18cc9ec7f4d7948ad6b9df0e04fc649663e3c0ed59f304ed17ca69e9"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -3229,9 +3229,9 @@ dependencies = [
[[package]] [[package]]
name = "snapbox-macros" name = "snapbox-macros"
version = "0.3.8" version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d"
dependencies = [ dependencies = [
"anstream", "anstream",
] ]

2
Cargo.toml
View File

@ -91,7 +91,7 @@ sha1 = "0.10.6"
sha2 = "0.10.8" sha2 = "0.10.8"
shell-escape = "0.1.5" shell-escape = "0.1.5"
supports-hyperlinks = "3.0.0" supports-hyperlinks = "3.0.0"
snapbox = { version = "0.5.9", features = ["diff", "path", "term-svg"] } snapbox = { version = "0.6.5", features = ["diff", "dir", "term-svg"] }
tar = { version = "0.4.40", default-features = false } tar = { version = "0.4.40", default-features = false }
tempfile = "3.10.1" tempfile = "3.10.1"
thiserror = "1.0.59" thiserror = "1.0.59"

18
crates/cargo-test-support/src/compare.rs
View File

@ -80,21 +80,15 @@ pub fn assert_ui() -> snapbox::Assert {
// Use `from_file_path` instead of `from_dir_path` so the trailing slash is // Use `from_file_path` instead of `from_dir_path` so the trailing slash is
// put in the users output, rather than hidden in the variable // put in the users output, rather than hidden in the variable
let root_url = url::Url::from_file_path(&root).unwrap().to_string(); let root_url = url::Url::from_file_path(&root).unwrap().to_string();
let root = root.display().to_string();
let mut subs = snapbox::Substitutions::new(); let mut subs = snapbox::Redactions::new();
subs.extend([ subs.extend([("[EXE]", std::env::consts::EXE_SUFFIX)])
(
"[EXE]",
std::borrow::Cow::Borrowed(std::env::consts::EXE_SUFFIX),
),
("[ROOT]", std::borrow::Cow::Owned(root)),
("[ROOTURL]", std::borrow::Cow::Owned(root_url)),
])
.unwrap(); .unwrap();
subs.insert("[ROOT]", root).unwrap();
subs.insert("[ROOTURL]", root_url).unwrap();
snapbox::Assert::new() snapbox::Assert::new()
.action_env(snapbox::DEFAULT_ACTION_ENV) .action_env(snapbox::assert::DEFAULT_ACTION_ENV)
.substitutions(subs) .redact_with(subs)
} }
/// Normalizes the output so that it can be compared against the expected value. /// Normalizes the output so that it can be compared against the expected value.

4
crates/cargo-test-support/src/lib.rs
View File

@ -40,8 +40,8 @@ macro_rules! t {
} }
pub use snapbox::file; pub use snapbox::file;
pub use snapbox::path::current_dir;
pub use snapbox::str; pub use snapbox::str;
pub use snapbox::utils::current_dir;
#[track_caller] #[track_caller]
pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! { pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! {
@ -315,7 +315,7 @@ impl Project {
pub fn from_template(template_path: impl AsRef<std::path::Path>) -> Self { pub fn from_template(template_path: impl AsRef<std::path::Path>) -> Self {
let root = paths::root(); let root = paths::root();
let project_root = root.join("case"); let project_root = root.join("case");
snapbox::path::copy_template(template_path.as_ref(), &project_root).unwrap(); snapbox::dir::copy_template(template_path.as_ref(), &project_root).unwrap();
Self { root: project_root } Self { root: project_root }
} }

5
crates/cargo-util-schemas/src/core/partial_version.rs
View File

@ -186,6 +186,7 @@ enum ErrorKind {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use snapbox::prelude::*;
use snapbox::str; use snapbox::str;
#[test] #[test]
@ -202,7 +203,7 @@ mod test {
Ok(result) => result.to_string(), Ok(result) => result.to_string(),
Err(err) => format!("didn't pass: {err}"), Err(err) => format!("didn't pass: {err}"),
}; };
snapbox::assert_eq(expected.clone(), actual); snapbox::assert_data_eq!(actual, expected.clone().raw());
} }
} }
@ -241,7 +242,7 @@ mod test {
Ok(result) => format!("didn't fail: {result:?}"), Ok(result) => format!("didn't fail: {result:?}"),
Err(err) => err.to_string(), Err(err) => err.to_string(),
}; };
snapbox::assert_eq(expected.clone(), actual); snapbox::assert_data_eq!(actual, expected.clone().raw());
} }
} }
} }

3
crates/cargo-util-schemas/src/manifest/rust_version.rs
View File

@ -106,6 +106,7 @@ enum RustVersionErrorKind {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
use snapbox::prelude::*;
use snapbox::str; use snapbox::str;
#[test] #[test]
@ -212,7 +213,7 @@ mod test {
Ok(result) => format!("didn't fail: {result:?}"), Ok(result) => format!("didn't fail: {result:?}"),
Err(err) => err.to_string(), Err(err) => err.to_string(),
}; };
snapbox::assert_eq(expected.clone(), actual); snapbox::assert_data_eq!(actual, expected.clone().raw());
} }
} }
} }

2
crates/mdman/tests/compare.rs
View File

@ -22,7 +22,7 @@ fn run(name: &str) {
name, name,
format.extension(section) format.extension(section)
)); ));
snapbox::assert_eq(snapbox::Data::read_from(&expected_path, None), result); snapbox::assert_data_eq!(result, snapbox::Data::read_from(&expected_path, None).raw());
} }
} }

5
crates/mdman/tests/invalid.rs
View File

@ -3,15 +3,16 @@
use std::path::PathBuf; use std::path::PathBuf;
use mdman::{Format, ManMap}; use mdman::{Format, ManMap};
use snapbox::prelude::*;
fn run(name: &str, expected_error: &str) { fn run(name: &str, expected_error: impl IntoData) {
let input = PathBuf::from(format!("tests/invalid/{}", name)); let input = PathBuf::from(format!("tests/invalid/{}", name));
match mdman::convert(&input, Format::Man, None, ManMap::new()) { match mdman::convert(&input, Format::Man, None, ManMap::new()) {
Ok(_) => { Ok(_) => {
panic!("expected {} to fail", name); panic!("expected {} to fail", name);
} }
Err(e) => { Err(e) => {
snapbox::assert_eq(expected_error, e.to_string()); snapbox::assert_data_eq!(e.to_string(), expected_error.raw());
} }
} }
} }

2
credential/cargo-credential/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cargo-credential" name = "cargo-credential"
version = "0.4.5" version = "0.4.6"
rust-version.workspace = true rust-version.workspace = true
edition.workspace = true edition.workspace = true
license.workspace = true license.workspace = true

2
credential/cargo-credential/src/stdio.rs
View File

@ -143,7 +143,7 @@ mod test {
#[test] #[test]
fn stdin() { fn stdin() {
let tempdir = snapbox::path::PathFixture::mutable_temp().unwrap(); let tempdir = snapbox::dir::DirRoot::mutable_temp().unwrap();
let file = tempdir.path().unwrap().join("stdin"); let file = tempdir.path().unwrap().join("stdin");
let mut file = OpenOptions::new() let mut file = OpenOptions::new()
.read(true) .read(true)

9
credential/cargo-credential/tests/examples.rs
View File

@ -1,6 +1,7 @@
use std::path::Path; use std::path::Path;
use snapbox::cmd::Command; use snapbox::cmd::Command;
use snapbox::prelude::*;
#[test] #[test]
fn stdout_redirected() { fn stdout_redirected() {
@ -14,8 +15,8 @@ fn stdout_redirected() {
.stdin(format!("{get_request}\n")) .stdin(format!("{get_request}\n"))
.arg("--cargo-plugin") .arg("--cargo-plugin")
.assert() .assert()
.stdout_eq(format!("{hello}\n{err_not_supported}\n")) .stdout_eq(format!("{hello}\n{err_not_supported}\n").raw())
.stderr_eq("message on stderr should be sent to the parent process\n") .stderr_eq("message on stderr should be sent to the parent process\n".raw())
.success(); .success();
} }
@ -38,8 +39,8 @@ fn file_provider() {
.stdin(format!("{login_request}\n{get_request}\n")) .stdin(format!("{login_request}\n{get_request}\n"))
.arg("--cargo-plugin") .arg("--cargo-plugin")
.assert() .assert()
.stdout_eq(format!("{hello}\n{login_response}\n{get_response}\n")) .stdout_eq(format!("{hello}\n{login_response}\n{get_response}\n").raw())
.stderr_eq("") .stderr_eq("".raw())
.success(); .success();
std::fs::remove_dir_all(&dir).unwrap(); std::fs::remove_dir_all(&dir).unwrap();
} }

7
src/cargo/core/features.rs
View File

@ -733,10 +733,9 @@ macro_rules! unstable_cli_options {
); );
let mut expected = vec![$(stringify!($element)),*]; let mut expected = vec![$(stringify!($element)),*];
expected[2..].sort(); expected[2..].sort();
snapbox::assert_eq( let expected = format!("{:#?}", expected);
format!("{:#?}", expected), let actual = format!("{:#?}", vec![$(stringify!($element)),*]);
format!("{:#?}", vec![$(stringify!($element)),*]) snapbox::assert_data_eq!(actual, expected);
);
} }
} }
} }

76
src/cargo/util/toml/embedded.rs
View File

@ -261,6 +261,8 @@ fn split_source(input: &str) -> CargoResult<Source<'_>> {
#[cfg(test)] #[cfg(test)]
mod test_expand { mod test_expand {
use snapbox::str;
use super::*; use super::*;
macro_rules! si { macro_rules! si {
@ -276,8 +278,10 @@ mod test_expand {
#[test] #[test]
fn test_default() { fn test_default() {
snapbox::assert_eq( snapbox::assert_data_eq!(
r#"[[bin]] si!(r#"fn main() {}"#),
str![[r#"
[[bin]]
name = "test-" name = "test-"
path = "/home/me/test.rs" path = "/home/me/test.rs"
@ -294,48 +298,22 @@ name = "test-"
strip = true strip = true
[workspace] [workspace]
"#,
si!(r#"fn main() {}"#), "#]]
); );
} }
#[test] #[test]
fn test_dependencies() { fn test_dependencies() {
snapbox::assert_matches( snapbox::assert_data_eq!(
r#"[[bin]]
name = "test-"
path = [..]
[dependencies]
time = "0.1.25"
[package]
autobenches = false
autobins = false
autoexamples = false
autotests = false
build = false
edition = "2021"
name = "test-"
[profile.release]
strip = true
[workspace]
"#,
si!(r#"---cargo si!(r#"---cargo
[dependencies] [dependencies]
time="0.1.25" time="0.1.25"
--- ---
fn main() {} fn main() {}
"#), "#),
); str![[r#"
} [[bin]]
#[test]
fn test_no_infostring() {
snapbox::assert_matches(
r#"[[bin]]
name = "test-" name = "test-"
path = [..] path = [..]
@ -355,13 +333,43 @@ name = "test-"
strip = true strip = true
[workspace] [workspace]
"#,
"#]]
);
}
#[test]
fn test_no_infostring() {
snapbox::assert_data_eq!(
si!(r#"--- si!(r#"---
[dependencies] [dependencies]
time="0.1.25" time="0.1.25"
--- ---
fn main() {} fn main() {}
"#), "#),
str![[r#"
[[bin]]
name = "test-"
path = [..]
[dependencies]
time = "0.1.25"
[package]
autobenches = false
autobins = false
autoexamples = false
autotests = false
build = false
edition = "2021"
name = "test-"
[profile.release]
strip = true
[workspace]
"#]]
); );
} }
} }

4
tests/testsuite/cargo/help/mod.rs
View File

@ -8,6 +8,6 @@ fn case() {
.arg("--help") .arg("--help")
.assert() .assert()
.success() .success()
.stdout_matches(file!["stdout.term.svg"]) .stdout_eq(file!["stdout.term.svg"])
.stderr_matches(str![""]); .stderr_eq(str![""]);
} }

4
tests/testsuite/cargo/z_help/mod.rs
View File

@ -9,6 +9,6 @@ fn case() {
.args(["-Z", "help"]) .args(["-Z", "help"])
.assert() .assert()
.success() .success()
.stdout_matches(file!["stdout.term.svg"]) .stdout_eq(file!["stdout.term.svg"])
.stderr_matches(str![""]); .stderr_eq(str![""]);
} }

4
tests/testsuite/cargo_add/add_basic/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/add_multiple/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs
View File

@ -29,8 +29,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/add_normalized_name_external/mod.rs
View File

@ -35,8 +35,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/add_toolchain/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/build/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/change_rename_target/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/cyclic_features/mod.rs
View File

@ -24,8 +24,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/default_features/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/deprecated_default_features/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/deprecated_section/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/detect_workspace_inherit_public/mod.rs
View File

@ -20,8 +20,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/dev/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/dev_build_conflict/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(1) .code(1)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/dev_prefer_existing_version/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/dry_run/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/empty_dep_name/mod.rs
View File

@ -18,8 +18,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_activated_over_limit/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_deactivated_over_limit/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_empty/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_multiple_occurrences/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_preserve/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_spaced_values/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_unknown/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/features_unknown_no_features/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git/mod.rs
View File

@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_branch/mod.rs
View File

@ -31,8 +31,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_conflicts_namever/mod.rs
View File

@ -34,8 +34,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_dev/mod.rs
View File

@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_inferred_name/mod.rs
View File

@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
View File

@ -68,8 +68,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_multiple_names/mod.rs
View File

@ -46,8 +46,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
View File

@ -57,8 +57,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_normalized_name/mod.rs
View File

@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() // Fuzzy searching for paths isn't supported at this time .failure() // Fuzzy searching for paths isn't supported at this time
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_registry/mod.rs
View File

@ -47,8 +47,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_rev/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/git_tag/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/help/mod.rs
View File

@ -9,6 +9,6 @@ fn case() {
.arg("--help") .arg("--help")
.assert() .assert()
.success() .success()
.stdout_matches(file!["stdout.term.svg"]) .stdout_eq(file!["stdout.term.svg"])
.stderr_matches(str![""]); .stderr_eq(str![""]);
} }

4
tests/testsuite/cargo_add/infer_prerelease/mod.rs
View File

@ -20,8 +20,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_arg/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(1) .code(1)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_git_name/mod.rs
View File

@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_manifest/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_name_external/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_path/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_path_name/mod.rs
View File

@ -31,8 +31,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_path_self/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_target_empty/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(1) .code(1)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/invalid_vers/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/list_features/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/list_features_path/mod.rs
View File

@ -36,8 +36,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/list_features_path_no_default/mod.rs
View File

@ -41,8 +41,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/locked_changed/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.failure() .failure()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/locked_unchanged/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/lockfile_updated/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/manifest_path_package/mod.rs
View File

@ -37,8 +37,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/merge_activated_features/mod.rs
View File

@ -17,8 +17,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/multiple_conflicts_with_features/mod.rs
View File

@ -36,8 +36,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/multiple_conflicts_with_rename/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/namever/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/no_args/mod.rs
View File

@ -18,8 +18,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(1) .code(1)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/no_default_features/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/no_optional/mod.rs
View File

@ -20,8 +20,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/no_public/mod.rs
View File

@ -20,8 +20,8 @@ fn case() {
.masquerade_as_nightly_cargo(&["public-dependency"]) .masquerade_as_nightly_cargo(&["public-dependency"])
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/offline_empty_cache/mod.rs
View File

@ -30,8 +30,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.code(101) .code(101)
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/optional/mod.rs
View File

@ -20,8 +20,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_default_features/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_features/mod.rs
View File

@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_git_with_path/mod.rs
View File

@ -31,8 +31,8 @@ fn case() {
.current_dir(&cwd) .current_dir(&cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
View File

@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_inline_features/mod.rs
View File

@ -38,8 +38,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_name_dev_noop/mod.rs
View File

@ -26,8 +26,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_name_noop/mod.rs
View File

@ -26,8 +26,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

4
tests/testsuite/cargo_add/overwrite_no_default_features/mod.rs
View File

@ -32,8 +32,8 @@ fn case() {
.current_dir(cwd) .current_dir(cwd)
.assert() .assert()
.success() .success()
.stdout_matches(str![""]) .stdout_eq(str![""])
.stderr_matches(file!["stderr.term.svg"]); .stderr_eq(file!["stderr.term.svg"]);
assert_ui().subset_matches(current_dir!().join("out"), &project_root); assert_ui().subset_matches(current_dir!().join("out"), &project_root);
} }

Some files were not shown because too many files have changed in this diff Show More