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.

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

remove.masquerade_as_nightly_cargo() from various tests the no longer need it #10867

Merged
merged 1 commit into from
Jul 15, 2022

Conversation

Muscraft
Copy link
Member

When looking at making .masquerade_as_nightly_cargo() take in a list of reasons, I found various tests that no longer needed .masquerade_as_nightly_cargo(). This removes it from all of the offending tests.

I tried my best to find all tests that no longer need it but I could have missed one or two.

@rust-highfive
Copy link

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2022
Comment on lines 2012 to 2015
// none
// Should be the same as `-Zfeatures=all`
p.cargo("check -Zfeatures=compare")
.masquerade_as_nightly_cargo()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this should change. compare runs a special mode that compares the new feature resolver against the old.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw -Z features had been stabilized but missed it in core::features.rs. It should be fixed now

@Muscraft Muscraft force-pushed the remove-unneeded-nightly-from-tests branch from 2bbac7f to 4bc8fe8 Compare July 15, 2022 00:55
@ehuss
Copy link
Contributor

ehuss commented Jul 15, 2022

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jul 15, 2022

📌 Commit 4bc8fe8 has been approved by ehuss

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 15, 2022
@bors
Copy link
Contributor

bors commented Jul 15, 2022

⌛ Testing commit 4bc8fe8 with merge d583b21...

@bors
Copy link
Contributor

bors commented Jul 15, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing d583b21 to master...

@bors bors merged commit d583b21 into rust-lang:master Jul 15, 2022
@Muscraft Muscraft deleted the remove-unneeded-nightly-from-tests branch July 15, 2022 02:08
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2022
Update cargo

9 commits in 8827baaa781b37872134c1ba692a6f0aeb37890e..d8d30a75376f78bb0fabe3d28ee9d87aa8035309
2022-07-14 02:56:51 +0000 to 2022-07-19 13:59:17 +0000
- docs: fixing minor error in the default timing report filename (rust-lang/cargo#10879)
- Stabilize `--crate-type` flag for `cargo rustc` (rust-lang/cargo#10838)
- Stabilize `-Zmultitarget` (rust-lang/cargo#10766)
- Clean up leftover in unstable documentation (rust-lang/cargo#10874)
- Normalize path for `cargo vendor` output (rust-lang/cargo#10668)
- add a reason to `masquerade_as_nightly_cargo` so it is searchable (rust-lang/cargo#10868)
- Allow '.' in workspace.default-members in non-virtual workspaces. (rust-lang/cargo#10784)
- remove`.masquerade_as_nightly_cargo()` from various tests the no longer need it (rust-lang/cargo#10867)
- remove `.masquerade_as_nightly_cargo()` from build_script_extra_link_arg.rs (rust-lang/cargo#10866)
@ehuss ehuss added this to the 1.64.0 milestone Jul 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants