Skip to content

Commit 8529eb1

Browse files
committed
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.
2 parents 8827baa + 2272159 commit 8529eb1

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

tests/testsuite/build_script_extra_link_arg.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ fn build_script_extra_link_arg_bin() {
2323
.build();
2424

2525
p.cargo("build -v")
26-
.masquerade_as_nightly_cargo()
2726
.without_status()
2827
.with_stderr_contains(
2928
"[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() {
6362
.build();
6463

6564
p.cargo("build -v")
66-
.masquerade_as_nightly_cargo()
6765
.without_status()
6866
.with_stderr_contains(
6967
"[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() {
9088
.build();
9189

9290
p.cargo("build -v")
93-
.masquerade_as_nightly_cargo()
9491
.without_status()
9592
.with_stderr_contains(
9693
"[RUNNING] `rustc --crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
@@ -126,7 +123,6 @@ fn link_arg_missing_target() {
126123
);
127124

128125
p.cargo("check")
129-
.masquerade_as_nightly_cargo()
130126
.with_status(101)
131127
.with_stderr("\
132128
[COMPILING] foo [..]
@@ -141,7 +137,6 @@ The package foo v0.0.1 ([ROOT]/foo) does not have a bin target.
141137
);
142138

143139
p.cargo("check")
144-
.masquerade_as_nightly_cargo()
145140
.with_status(101)
146141
.with_stderr(
147142
"\
@@ -158,7 +153,6 @@ The package foo v0.0.1 ([ROOT]/foo) does not have a bin target with the name `ab
158153
);
159154

160155
p.cargo("check")
161-
.masquerade_as_nightly_cargo()
162156
.with_status(101)
163157
.with_stderr(
164158
"\
@@ -261,7 +255,6 @@ fn link_arg_transitive_not_allowed() {
261255
.build();
262256

263257
p.cargo("build -v")
264-
.masquerade_as_nightly_cargo()
265258
.with_stderr(
266259
"\
267260
[UPDATING] [..]
@@ -303,7 +296,6 @@ fn link_arg_with_doctest() {
303296
.build();
304297

305298
p.cargo("test --doc -v")
306-
.masquerade_as_nightly_cargo()
307299
.without_status()
308300
.with_stderr_contains(
309301
"[RUNNING] `rustdoc [..]--crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",

0 commit comments

Comments
 (0)