Skip to content

Commit 447ac75

Browse files
committed
fix(test): Reduce over-prescription to the caller
This is a follow-up fix that addresses the suggestion made in #14200 (comment) for the remaining files.
1 parent d1a62df commit 447ac75

File tree

3 files changed

+137
-76
lines changed

3 files changed

+137
-76
lines changed

tests/testsuite/build_script.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use cargo_test_support::{
1212
};
1313
use cargo_test_support::{rustc_host, sleep_ms, slow_cpu_multiplier, symlink_supported};
1414
use cargo_util::paths::{self, remove_dir_all};
15-
use snapbox::data::Inline;
1615
use std::env;
1716
use std::fs;
1817
use std::io;
@@ -4562,7 +4561,7 @@ fn rename_with_link_search_path_cross() {
45624561
);
45634562
}
45644563

4565-
fn _rename_with_link_search_path(cross: bool, expected: Inline) {
4564+
fn _rename_with_link_search_path(cross: bool, expected: impl IntoData) {
45664565
let target_arg = if cross {
45674566
format!(" --target={}", cross_compile::alternate())
45684567
} else {

tests/testsuite/fix_n_times.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! up, and verifying the results.
1616
1717
use cargo_test_support::{basic_manifest, paths, project, str, tools, Execs};
18-
use snapbox::data::Inline;
18+
use snapbox::IntoData;
1919
use std::path::PathBuf;
2020
use std::sync::{Mutex, OnceLock};
2121

@@ -59,7 +59,7 @@ enum Step {
5959
fn expect_fix_runs_rustc_n_times(
6060
sequence: &[Step],
6161
extra_execs: impl FnOnce(&mut Execs),
62-
expected_stderr: Inline,
62+
expected_stderr: impl IntoData,
6363
expected_lib_rs: &str,
6464
) {
6565
let rustc = rustc_for_cargo_fix();

0 commit comments

Comments
 (0)