Skip to content

Commit 9090349

Browse files
borsbors
committed
Auto merge of #13441 - epage:snapbox, r=Muscraft
chore: Update snapbox
2 parents 8ad0e18 + 9f31f8c commit 9090349

File tree

266 files changed

+1440
-1407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+1440
-1407
lines changed

‎.cargo/config.toml

+5
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22
build-man = "run --package xtask-build-man --"
33
stale-label = "run --package xtask-stale-label --"
44
bump-check = "run --package xtask-bump-check --"
5+
6+
[env]
7+
# HACK: Until this is stabilized, `snapbox`s polyfill could get confused
8+
# inside of the rust-lang/rust repo because it looks for the furthest-away `Cargo.toml`
9+
CARGO_RUSTC_CURRENT_DIR = { value = "", relative = true }

‎Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ sha1 = "0.10.6"
9191
sha2 = "0.10.8"
9292
shell-escape = "0.1.5"
9393
supports-hyperlinks = "2.1.0"
94-
snapbox = { version = "0.4.16", features = ["diff", "path"] }
94+
snapbox = { version = "0.5.0", features = ["diff", "path"] }
9595
tar = { version = "0.4.40", default-features = false }
9696
tempfile = "3.9.0"
9797
thiserror = "1.0.56"

‎crates/cargo-test-support/src/lib.rs

+2-19
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,8 @@ macro_rules! t {
3535
};
3636
}
3737

38-
#[macro_export]
39-
macro_rules! curr_dir {
40-
() => {
41-
$crate::_curr_dir(std::path::Path::new(file!()));
42-
};
43-
}
44-
45-
#[doc(hidden)]
46-
pub fn _curr_dir(mut file_path: &'static Path) -> &'static Path {
47-
if !file_path.exists() {
48-
// HACK: Must be running in the rust-lang/rust workspace, adjust the paths accordingly.
49-
let prefix = PathBuf::from("src").join("tools").join("cargo");
50-
if let Ok(crate_relative) = file_path.strip_prefix(prefix) {
51-
file_path = crate_relative
52-
}
53-
}
54-
assert!(file_path.exists(), "{} does not exist", file_path.display());
55-
file_path.parent().unwrap()
56-
}
38+
pub use snapbox::file;
39+
pub use snapbox::path::current_dir;
5740

5841
#[track_caller]
5942
pub fn panic_error(what: &str, err: impl Into<anyhow::Error>) -> ! {

‎crates/mdman/tests/compare.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ fn run(name: &str) {
1717
for &format in &[Format::Man, Format::Md, Format::Text] {
1818
let section = mdman::extract_section(&input).unwrap();
1919
let result = mdman::convert(&input, format, url.clone(), map.clone()).unwrap();
20-
let expected_path = format!(
20+
let expected_path = PathBuf::from(format!(
2121
"tests/compare/expected/{}.{}",
2222
name,
2323
format.extension(section)
24-
);
25-
snapbox::assert_eq_path(expected_path, result);
24+
));
25+
snapbox::assert_eq(snapbox::Data::read_from(&expected_path, None), result);
2626
}
2727
}
2828

‎tests/testsuite/cargo/help/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cargo_test_support::curr_dir;
1+
use cargo_test_support::file;
22
use cargo_test_support::prelude::*;
33

44
#[cargo_test]
@@ -7,6 +7,6 @@ fn case() {
77
.arg("--help")
88
.assert()
99
.success()
10-
.stdout_matches_path(curr_dir!().join("stdout.log"))
11-
.stderr_matches_path(curr_dir!().join("stderr.log"));
10+
.stdout_matches(file!["stdout.log"])
11+
.stderr_matches(file!["stderr.log"]);
1212
}

‎tests/testsuite/cargo/z_help/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cargo_test_support::curr_dir;
1+
use cargo_test_support::file;
22
use cargo_test_support::prelude::*;
33

44
#[cargo_test]
@@ -8,6 +8,6 @@ fn case() {
88
.args(["-Z", "help"])
99
.assert()
1010
.success()
11-
.stdout_matches_path(curr_dir!().join("stdout.log"))
12-
.stderr_matches_path(curr_dir!().join("stderr.log"));
11+
.stdout_matches(file!["stdout.log"])
12+
.stderr_matches(file!["stderr.log"]);
1313
}

‎tests/testsuite/cargo_add/add_basic/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -19,7 +19,7 @@ fn case() {
1919
cargo_test_support::registry::Package::new("my-package", ver).publish();
2020
}
2121

22-
let project = Project::from_template(curr_dir!().join("in"));
22+
let project = Project::from_template(current_dir!().join("in"));
2323
let project_root = project.root();
2424
let cwd = &project_root;
2525

@@ -29,8 +29,8 @@ fn case() {
2929
.current_dir(cwd)
3030
.assert()
3131
.success()
32-
.stdout_matches_path(curr_dir!().join("stdout.log"))
33-
.stderr_matches_path(curr_dir!().join("stderr.log"));
32+
.stdout_matches(file!["stdout.log"])
33+
.stderr_matches(file!["stderr.log"]);
3434

35-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
35+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3636
}

‎tests/testsuite/cargo_add/add_multiple/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -21,7 +21,7 @@ fn case() {
2121
}
2222
}
2323

24-
let project = Project::from_template(curr_dir!().join("in"));
24+
let project = Project::from_template(current_dir!().join("in"));
2525
let project_root = project.root();
2626
let cwd = &project_root;
2727

@@ -31,8 +31,8 @@ fn case() {
3131
.current_dir(cwd)
3232
.assert()
3333
.success()
34-
.stdout_matches_path(curr_dir!().join("stdout.log"))
35-
.stderr_matches_path(curr_dir!().join("stderr.log"));
34+
.stdout_matches(file!["stdout.log"])
35+
.stderr_matches(file!["stderr.log"]);
3636

37-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
37+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3838
}

‎tests/testsuite/cargo_add/add_normalized_name_external/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -24,7 +24,7 @@ fn case() {
2424
.feature("unstable", &[])
2525
.publish();
2626

27-
let project = Project::from_template(curr_dir!().join("in"));
27+
let project = Project::from_template(current_dir!().join("in"));
2828
let project_root = project.root();
2929
let cwd = &project_root;
3030

@@ -34,8 +34,8 @@ fn case() {
3434
.current_dir(cwd)
3535
.assert()
3636
.success()
37-
.stdout_matches_path(curr_dir!().join("stdout.log"))
38-
.stderr_matches_path(curr_dir!().join("stderr.log"));
37+
.stdout_matches(file!["stdout.log"])
38+
.stderr_matches(file!["stderr.log"]);
3939

40-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
40+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
4141
}

‎tests/testsuite/cargo_add/add_toolchain/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
9-
let project = Project::from_template(curr_dir!().join("in"));
9+
let project = Project::from_template(current_dir!().join("in"));
1010
let project_root = project.root();
1111
let cwd = &project_root;
1212

@@ -16,8 +16,8 @@ fn case() {
1616
.current_dir(cwd)
1717
.assert()
1818
.failure()
19-
.stdout_matches_path(curr_dir!().join("stdout.log"))
20-
.stderr_matches_path(curr_dir!().join("stderr.log"));
19+
.stdout_matches(file!["stdout.log"])
20+
.stderr_matches(file!["stderr.log"]);
2121

22-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
22+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
2323
}

‎tests/testsuite/cargo_add/build/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -21,7 +21,7 @@ fn case() {
2121
}
2222
}
2323

24-
let project = Project::from_template(curr_dir!().join("in"));
24+
let project = Project::from_template(current_dir!().join("in"));
2525
let project_root = project.root();
2626
let cwd = &project_root;
2727

@@ -31,8 +31,8 @@ fn case() {
3131
.current_dir(cwd)
3232
.assert()
3333
.success()
34-
.stdout_matches_path(curr_dir!().join("stdout.log"))
35-
.stderr_matches_path(curr_dir!().join("stderr.log"));
34+
.stdout_matches(file!["stdout.log"])
35+
.stderr_matches(file!["stderr.log"]);
3636

37-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
37+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3838
}

‎tests/testsuite/cargo_add/build_prefer_existing_version/mod.rs

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

@@ -19,8 +21,7 @@ fn case() {
1921
.publish();
2022
}
2123

22-
let project =
23-
Project::from_template("tests/testsuite/cargo_add/build_prefer_existing_version/in");
24+
let project = Project::from_template(current_dir!().join("in"));
2425
let project_root = project.root();
2526
let cwd = &project_root;
2627

@@ -30,11 +31,8 @@ fn case() {
3031
.current_dir(cwd)
3132
.assert()
3233
.success()
33-
.stdout_matches_path("tests/testsuite/cargo_add/build_prefer_existing_version/stdout.log")
34-
.stderr_matches_path("tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log");
34+
.stdout_matches(file!["stdout.log"])
35+
.stderr_matches(file!["stderr.log"]);
3536

36-
assert_ui().subset_matches(
37-
"tests/testsuite/cargo_add/build_prefer_existing_version/out",
38-
&project_root,
39-
);
37+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
4038
}

‎tests/testsuite/cargo_add/change_rename_target/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -21,7 +21,7 @@ fn case() {
2121
}
2222
}
2323

24-
let project = Project::from_template(curr_dir!().join("in"));
24+
let project = Project::from_template(current_dir!().join("in"));
2525
let project_root = project.root();
2626
let cwd = &project_root;
2727

@@ -31,8 +31,8 @@ fn case() {
3131
.current_dir(cwd)
3232
.assert()
3333
.success()
34-
.stdout_matches_path(curr_dir!().join("stdout.log"))
35-
.stderr_matches_path(curr_dir!().join("stderr.log"));
34+
.stdout_matches(file!["stdout.log"])
35+
.stderr_matches(file!["stderr.log"]);
3636

37-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
37+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3838
}

‎tests/testsuite/cargo_add/cyclic_features/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use cargo_test_support::compare::assert_ui;
2+
use cargo_test_support::current_dir;
3+
use cargo_test_support::file;
24
use cargo_test_support::prelude::*;
35
use cargo_test_support::Project;
46

5-
use cargo_test_support::curr_dir;
6-
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
@@ -13,7 +13,7 @@ fn case() {
1313
.feature("feature-two", &["feature-one"])
1414
.publish();
1515

16-
let project = Project::from_template(curr_dir!().join("in"));
16+
let project = Project::from_template(current_dir!().join("in"));
1717
let project_root = project.root();
1818
let cwd = &project_root;
1919

@@ -23,8 +23,8 @@ fn case() {
2323
.current_dir(cwd)
2424
.assert()
2525
.success()
26-
.stdout_matches_path(curr_dir!().join("stdout.log"))
27-
.stderr_matches_path(curr_dir!().join("stderr.log"));
26+
.stdout_matches(file!["stdout.log"])
27+
.stderr_matches(file!["stderr.log"]);
2828

29-
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
29+
assert_ui().subset_matches(current_dir!().join("out"), &project_root);
3030
}

0 commit comments

Comments
 (0)