Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(test): Reduce over-prescription to the caller #14217

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix(test): Reduce over-prescription to the caller #14217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/testsuite/build_script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use cargo_test_support::{
};
use cargo_test_support::{rustc_host, sleep_ms, slow_cpu_multiplier, symlink_supported};
use cargo_util::paths::{self, remove_dir_all};
use snapbox::data::Inline;
use std::env;
use std::fs;
use std::io;
Expand Down Expand Up @@ -4562,7 +4561,7 @@ fn rename_with_link_search_path_cross() {
);
}

fn _rename_with_link_search_path(cross: bool, expected: Inline) {
fn _rename_with_link_search_path(cross: bool, expected: impl IntoData) {
let target_arg = if cross {
format!(" --target={}", cross_compile::alternate())
} else {
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/fix_n_times.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! up, and verifying the results.

use cargo_test_support::{basic_manifest, paths, project, str, tools, Execs};
use snapbox::data::Inline;
use snapbox::IntoData;
use std::path::PathBuf;
use std::sync::{Mutex, OnceLock};

Expand Down Expand Up @@ -59,7 +59,7 @@ enum Step {
fn expect_fix_runs_rustc_n_times(
sequence: &[Step],
extra_execs: impl FnOnce(&mut Execs),
expected_stderr: Inline,
expected_stderr: impl IntoData,
expected_lib_rs: &str,
) {
let rustc = rustc_for_cargo_fix();
Expand Down
Loading