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

Allow rustc bootstrap to use unstable features even though it's using a beta-cargo #5613

Merged
merged 2 commits into from
Jun 6, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Jun 6, 2018

This is the sane alternative to rust-lang/rust#51322 (comment)

cc @kennytm

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

}
if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") {
return override_channel;
}
Copy link
Member

Choose a reason for hiding this comment

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

This probably should take precedence over RUSTC_BOOTSTRAP? It may not matter, but I don't know if RUSTC_BOOTSTRAP is set when running Cargo tests in rustc repo.

@matklad
Copy link
Member

matklad commented Jun 6, 2018

@bors r_

@matklad
Copy link
Member

matklad commented Jun 6, 2018

=/

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 6, 2018

📌 Commit 1bdb89d has been approved by matklad

@bors
Copy link
Collaborator

bors commented Jun 6, 2018

⌛ Testing commit 1bdb89d with merge 946ab00...

bors added a commit that referenced this pull request Jun 6, 2018
Allow rustc bootstrap to use unstable features even though it's using a beta-cargo

This is the sane alternative to rust-lang/rust#51322 (comment)

cc @kennytm
@bors
Copy link
Collaborator

bors commented Jun 6, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing 946ab00 to master...

@bors bors merged commit 1bdb89d into rust-lang:master Jun 6, 2018
xurtis added a commit to xurtis/xargo that referenced this pull request Feb 16, 2020
When building the sysroot or rust compiler with a beta or stable rustc
binary the flag RUSTC_BOOTSTRAP can be set to 1 to allow rustc to allow
the same features as the development channel. This is required as the
rust compiler and sysroot make use of unstable features.

See here: rust-lang/cargo#5613
@ehuss ehuss added this to the 1.28.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants