Auto merge of #10866 - Muscraft:update-extra-link-tests, r=ehuss

remove `.masquerade_as_nightly_cargo()` from build_script_extra_link_arg.rs When looking at making [`.masquerade_as_nightly_cargo()` take in a list of reasons](https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/problems.20finding.20.60.2Emasquerade_as_nightly_cargo.28.29.60), I found that [`build_script_extra_link_arg.rs`](https://github.com/rust-lang/cargo/blob/8827baaa781b37872134c1ba692a6f0aeb37890e/tests/testsuite/build_script_extra_link_arg.rs) still was using it. `extra-link-arg` was [stabilized in 1.56.0](https://github.com/rust-lang/cargo/blob/8827baaa781b37872134c1ba692a6f0aeb37890e/src/doc/src/reference/unstable.md#extra-link-arg), so this PR removes `.masquerade_as_nightly_cargo()` from all the tests in this file.
rust-lang · Jul 14, 2022 · 8529eb1 · 8529eb1
2 parents 8827baa + 2272159
commit 8529eb1
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/tests/testsuite/build_script_extra_link_arg.rs b/tests/testsuite/build_script_extra_link_arg.rs
@@ -23,7 +23,6 @@ fn build_script_extra_link_arg_bin() {
         .build();
 
     p.cargo("build -v")
-        .masquerade_as_nightly_cargo()
         .without_status()
         .with_stderr_contains(
             "[RUNNING] `rustc --crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
@@ -63,7 +62,6 @@ fn build_script_extra_link_arg_bin_single() {
         .build();
 
     p.cargo("build -v")
-        .masquerade_as_nightly_cargo()
         .without_status()
         .with_stderr_contains(
             "[RUNNING] `rustc --crate-name foo [..]-C link-arg=--bogus-flag-all -C link-arg=--bogus-flag-foo[..]",
@@ -90,7 +88,6 @@ fn build_script_extra_link_arg() {
         .build();
 
     p.cargo("build -v")
-        .masquerade_as_nightly_cargo()
         .without_status()
         .with_stderr_contains(
             "[RUNNING] `rustc --crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
@@ -126,7 +123,6 @@ fn link_arg_missing_target() {
     );
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo()
         .with_status(101)
         .with_stderr("\
 [COMPILING] foo [..]
@@ -141,7 +137,6 @@ The package foo v0.0.1 ([ROOT]/foo) does not have a bin target.
     );
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo()
         .with_status(101)
         .with_stderr(
             "\
@@ -158,7 +153,6 @@ The package foo v0.0.1 ([ROOT]/foo) does not have a bin target with the name `ab
     );
 
     p.cargo("check")
-        .masquerade_as_nightly_cargo()
         .with_status(101)
         .with_stderr(
             "\
@@ -261,7 +255,6 @@ fn link_arg_transitive_not_allowed() {
         .build();
 
     p.cargo("build -v")
-        .masquerade_as_nightly_cargo()
         .with_stderr(
             "\
 [UPDATING] [..]
@@ -303,7 +296,6 @@ fn link_arg_with_doctest() {
         .build();
 
     p.cargo("test --doc -v")
-        .masquerade_as_nightly_cargo()
         .without_status()
         .with_stderr_contains(
             "[RUNNING] `rustdoc [..]--crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",