Forbid setting `RUSTC_BOOTSTRAP` from a build script on stable #9181

jyn514 · 2021-02-17T17:42:33Z

Instead, recommend RUSTC_BOOTSTRAP=crate_name. If cargo is using a nightly toolchain, or if RUSTC_BOOTSTRAP was set in cargo's build environment, the error is downgraded to a warning, since the variable won't affect the build.

This is mostly the same as suggested in #7088 (comment), except that RUSTC_BOOTSTRAP= values other than 1 are treated the same as RUSTC_BOOTSTRAP=1. My reasoning was that rust-lang/rust#77802 is now on 1.50 stable, so some crates may have started using it, and I would still prefer not to give hard errors when there's no workaround.

Closes #7088.

r? @joshtriplett

jyn514 · 2021-02-17T17:43:21Z

Note that this currently mucks around with the test suite, I couldn't figure out how to enable nightly features from an integration test: 03b2b51#diff-7b081a836e71ae12b28f42ba8f09384036be9ae8ee479b4849f43a8522e94b37R715. Maybe @Eh2406 has suggestions?

src/cargo/core/compiler/custom_build.rs

src/cargo/core/features.rs

tests/testsuite/build_script_env.rs

joshtriplett · 2021-02-18T01:34:59Z

Other than the testsuite issue, this looks good overall. And the verbiage seems reasonable to me.

ehuss · 2021-02-18T17:34:43Z

It looks like the issue with nightly_features_allowed is that it uses a thread-local value. When Cargo starts the compiling phase, each "Work" job runs in a separate thread, and those threads don't know about the masquerade_as_nightly_cargo override. That was done to make it work with unit-tests, but causes the problem you ran into.

I can think of a few different approaches:

You can capture the nightly_features_allowed state outside of the Work closure (from the main thread where it is set correctly).
Remove the thread-local stuff, and just make it a property of Config. I don't see anywhere that needs it without a Config, and that would get rid of the global. However, this would be a larger refactoring. This would be my slight preference (not a big fan of globals), but I'm not sure if you're up to doing that.
Remove the thread-local part, but keep it as a global, and just disable the unittests that need it on nightly (per my suggestion at cargo v0.27 tests failed when build rust 1.26.2 on "stable" channel #5648 (comment)). I think I'd prefer either of the previous two options, though.

jyn514 · 2021-02-18T17:55:11Z

Remove the thread-local stuff, and just make it a property of Config. I don't see anywhere that needs it without a Config, and that would get rid of the global. However, this would be a larger refactoring. This would be my slight preference (not a big fan of globals), but I'm not sure if you're up to doing that.

I'm happy to try that. That would remove NIGHTLY_FEATURES_ALLOWED and ENABLE_NIGHTLY_FEATURES? Should I add both to config and keep most of the logic in nightly_features_allowed or just have a single boolean?

jyn514 · 2021-02-18T18:27:19Z

Remove the thread-local stuff, and just make it a property of Config. I don't see anywhere that needs it without a Config, and that would get rid of the global. However, this would be a larger refactoring. This would be my slight preference (not a big fan of globals), but I'm not sure if you're up to doing that.

I tried doing this, but Config isn't thread-safe, so I can't pass it to Work::new. For now I think I'll capture the state outside of the closure.

jyn514 · 2021-02-23T01:52:55Z

This is ready for review.

bors · 2021-02-23T16:05:00Z

☔ The latest upstream changes (presumably #9175) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2021-02-23T22:17:01Z

☔ The latest upstream changes (presumably #9184) made this pull request unmergeable. Please resolve the merge conflicts.

ehuss

I think the thread_local! in features.rs can be removed.

Just as a stylistic choice, I would probably make the free functions nightly_features_allowed, maybe_allow_nightly_features, and enable_nightly_features as methods of Config instead. It's not necessary, but if you're so inclined I think it might be a little clearer.

I'm also a little concerned about frequently recomputing the channel. I was thinking it could be simplified a little by removing Config.maybe_allow_nightly_features by capturing the status when the Config is created. So it could be something like this in Config::new:

let nightly_features_allowed = is_nightly();

And only store that in Config. Then, the methods could be something like this:

fn nightly_features_allowed(&self) -> bool {
    self.nightly_features_allowed
}

fn set_nightly_features_allowed(&mut self, allowed: bool) {
    self.nightly_features_allowed = allowed;
    // This could maybe re-initialize things like nightly cli flags, but probably not necessary.
}

fn is_nightly() -> bool {
    matches!(channel(), "nightly" | "dev");
}

maybe_allow_nightly_features isn't really necessary if it is no longer global.

The comment at the top of build_script_env.rs may need to be changed.

src/cargo/core/compiler/custom_build.rs

crates/cargo-test-support/src/lib.rs

… the nightly channel

This was the whole point of rust-lang/rust#77802. - Pass `pkg.name()` to `parse()`. This can't pass the `Package` directly because `PackageInner` is an `Rc` and therefore not thread-safe. Note that `pkg_name` was previously a *description* of the package, not the name passed with `--crate-name`.

Previously, since `ENABLE_NIGHTLY_FEATURES` and `NIGHTLY_FEATURES_ENABLED` were thread locals, reading them in any other thread would always say nightly features were disabled. Now, they are tied to the `Context` itself, so it is both more clear how the variables are being set and fixes the behavior within work threads. Note that `Context` is not thread-safe, so this passes a boolean through to `BuildOutput::parse`.

This avoids reparsing `channel()` over and over again. It also makes `maybe_enable_nightly_features` unnecessary and removes it.

jyn514

I think the thread_local! in features.rs can be removed.

Thanks, done.

I removed enable_nightly_features() and maybe_enable_nightly_features() since they're not doing much anymore. Instead I just used a field on Config that gets set once based on the channel at startup. I also changed a test to manually set the channel to stable, since it assumed tests were on the stable channel by default.

src/cargo/core/compiler/custom_build.rs

crates/cargo-test-support/src/lib.rs

`nightly_features_allowed()` is no longer doing any work, so it can be accessed directly. This also renames the `enable_nightly_features` field to `nightly_features_allowed`.

The info was already present on `self`. Note that this uses a temporary variable to avoid a borrowck error from `slot`.

jyn514 · 2021-02-26T01:41:18Z

Test failure looks spurious: E: Failed to fetch http://security.ubuntu.com/ubuntu/dists/focal-security/main/i18n/Translation-en.xz File has unexpected size (111640 != 111832). Mirror sync in progress? [IP: 91.189.91.39 80]

ehuss · 2021-03-02T23:40:26Z

Sorry, you had a question about the link (sometimes GitHub doesn't have a response field for inline comments).

Do you think I should link https://rustc-dev-guide.rust-lang.org/building/bootstrapping.html#complications-of-bootstrapping instead, or just remove the link altogether?

If there were a link, I would probably use https://github.com/rust-lang/cargo/issues/7088 if anything. The build script docs don't talk about bootstrapping or setting env vars before cargo, and other docs I think may be confusing. #7088 describes the motivation for the restriction and provides plenty of links and discussion if anyone wants to know more about it. Hopefully this only impacts a very tiny number of projects, so I don't think it is super important to be any sort of formal documentation. I personally would not include a link, but up to you!

BTW, I appreciate you taking the time to refactor all the nightly flag stuff, as that wasn't really a core part of the change, but I do think it helps clean things up and make testing nicer.

jyn514 · 2021-03-03T00:17:35Z

I personally would not include a link, but up to you!

I left out the link for now. I think the projects that would be most impacted have already heard about it, and we can always add it later if someone is confused.

BTW, I appreciate you taking the time to refactor all the nightly flag stuff, as that wasn't really a core part of the change, but I do think it helps clean things up and make testing nicer.

You're very welcome!

I think this is ready to merge :)

src/cargo/core/compiler/custom_build.rs

It didn't have any information about RUSTC_BOOTSTRAP itself, only the general `rustc-env` feature.

ehuss · 2021-03-03T03:19:28Z

Thanks!

@bors r+

bors · 2021-03-03T03:19:30Z

📌 Commit 0b18165 has been approved by ehuss

bors · 2021-03-03T03:19:38Z

⌛ Testing commit 0b18165 with merge b219f0e...

bors · 2021-03-03T03:45:30Z

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

Update Cargo Fixes breakage caused by rust-lang/cargo#9181.

Package changes: * bump bootstraps to 1.51.0. * adjust patches and cargo checksums as required * 1.51 failed to build natively on 32-bit armv7, there is hope that this is fixed with 1.52. (1.51 can be built with netbsd32 emulation on a aarch64 system). Upsteream changes: Version 1.52.0 (2021-05-06) ============================ Language -------- - [Added the `unsafe_op_in_unsafe_fn` lint, which checks whether the unsafe code in an `unsafe fn` is wrapped in a `unsafe` block.][79208] This lint is allowed by default, and may become a warning or hard error in a future edition. - [You can now cast mutable references to arrays to a pointer of the same type as the element.][81479] Compiler -------- - [Upgraded the default LLVM to LLVM 12.][81451] Added tier 3\* support for the following targets. - [`s390x-unknown-linux-musl`][82166] - [`riscv32gc-unknown-linux-musl` & `riscv64gc-unknown-linux-musl`][82202] - [`powerpc-unknown-openbsd`][82733] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [`OsString` now implements `Extend` and `FromIterator`.][82121] - [`cmp::Reverse` now has `#[repr(transparent)]` representation.][81879] - [`Arc<impl Error>` now implements `error::Error`.][80553] - [All integer division and remainder operations are now `const`.][80962] Stabilised APIs ------------- - [`Arguments::as_str`] - [`char::MAX`] - [`char::REPLACEMENT_CHARACTER`] - [`char::UNICODE_VERSION`] - [`char::decode_utf16`] - [`char::from_digit`] - [`char::from_u32_unchecked`] - [`char::from_u32`] - [`slice::partition_point`] - [`str::rsplit_once`] - [`str::split_once`] The following previously stable APIs are now `const`. - [`char::len_utf8`] - [`char::len_utf16`] - [`char::to_ascii_uppercase`] - [`char::to_ascii_lowercase`] - [`char::eq_ignore_ascii_case`] - [`u8::to_ascii_uppercase`] - [`u8::to_ascii_lowercase`] - [`u8::eq_ignore_ascii_case`] Rustdoc ------- - [Rustdoc lints are now treated as a tool lint, meaning that lints are now prefixed with `rustdoc::` (e.g. `#[warn(rustdoc::non_autolinks)]`).][80527] Using the old style is still allowed, and will become a warning in a future release. - [Rustdoc now supports argument files.][82261] - [Rustdoc now generates smart punctuation for documentation.][79423] - [You can now use "task lists" in Rustdoc Markdown.][81766] E.g. ```markdown - [x] Complete - [ ] Todo ``` Misc ---- - [You can now pass multiple filters to tests.][81356] E.g. `cargo test -- foo bar` will run all tests that match `foo` and `bar`. - [Rustup now distributes PDB symbols for the `std` library on Windows, allowing you to see `std` symbols when debugging.][82218] Internal Only ------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Check the result cache before the DepGraph when ensuring queries][81855] - [Try fast_reject::simplify_type in coherence before doing full check][81744] - [Only store a LocalDefId in some HIR nodes][81611] - [Store HIR attributes in a side table][79519] Compatibility Notes ------------------- - [Cargo build scripts are now forbidden from setting `RUSTC_BOOTSTRAP`.] [cargo/9181] - [Removed support for the `x86_64-rumprun-netbsd` target.][82594] - [Deprecated the `x86_64-sun-solaris` target in favor of `x86_64-pc-solaris`.] [82216] - [Rustdoc now only accepts `,`, ` `, and `\t` as delimiters for specifying languages in code blocks.][78429] - [Rustc now catches more cases of `pub_use_of_private_extern_crate`][80763] - [Changes in how proc macros handle whitespace may lead to panics when used with older `proc-macro-hack` versions. A `cargo update` should be sufficient to fix this in all cases.][84136] [84136]: rust-lang/rust#84136 [80763]: rust-lang/rust#80763 [82166]: rust-lang/rust#82166 [82121]: rust-lang/rust#82121 [81879]: rust-lang/rust#81879 [82261]: rust-lang/rust#82261 [82218]: rust-lang/rust#82218 [82216]: rust-lang/rust#82216 [82202]: rust-lang/rust#82202 [81855]: rust-lang/rust#81855 [81766]: rust-lang/rust#81766 [81744]: rust-lang/rust#81744 [81611]: rust-lang/rust#81611 [81479]: rust-lang/rust#81479 [81451]: rust-lang/rust#81451 [81356]: rust-lang/rust#81356 [80962]: rust-lang/rust#80962 [80553]: rust-lang/rust#80553 [80527]: rust-lang/rust#80527 [79519]: rust-lang/rust#79519 [79423]: rust-lang/rust#79423 [79208]: rust-lang/rust#79208 [78429]: rust-lang/rust#78429 [82733]: rust-lang/rust#82733 [82594]: rust-lang/rust#82594 [cargo/9181]: rust-lang/cargo#9181 [`char::MAX`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.MAX [`char::REPLACEMENT_CHARACTER`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.REPLACEMENT_CHARACTER [`char::UNICODE_VERSION`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.UNICODE_VERSION [`char::decode_utf16`]: https://doc.rust-lang.org/std/primitive.char.html#method.decode_utf16 [`char::from_u32`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32 [`char::from_u32_unchecked`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32_unchecked [`char::from_digit`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_digit [`Peekable::next_if`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if [`Peekable::next_if_eq`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if_eq [`Arguments::as_str`]: https://doc.rust-lang.org/stable/std/fmt/struct.Arguments.html#method.as_str [`str::split_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.split_once [`str::rsplit_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.rsplit_once [`slice::partition_point`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.partition_point [`char::len_utf8`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf8 [`char::len_utf16`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf16 [`char::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_uppercase [`char::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_lowercase [`char::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.eq_ignore_ascii_case [`u8::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_uppercase [`u8::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_lowercase [`u8::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.eq_ignore_ascii_case

Pkgsrc changes: * Bump bootstrap kit version to 1.51.0. * Adjust patches as needed. * Update checksum adjustments. * Fix syntax error in commands adjusting libserde_derive for Darwin Upstream changes: Version 1.52.1 (2021-05-10) ============================ This release disables incremental compilation, unless the user has explicitly opted in via the newly added RUSTC_FORCE_INCREMENTAL=1 environment variable. This is due to the widespread, and frequently occuring, breakage encountered by Rust users due to newly enabled incremental verification in 1.52.0. Notably, Rust users **should** upgrade to 1.52.0 or 1.52.1: the bugs that are detected by newly added incremental verification are still present in past stable versions, and are not yet fixed on any channel. These bugs can lead to miscompilation of Rust binaries. These problems only affect incremental builds, so release builds with Cargo should not be affected unless the user has explicitly opted into incremental. Debug and check builds are affected. See [84970] for more details. [84970]: rust-lang/rust#84970 Version 1.52.0 (2021-05-06) ============================ Language -------- - [Added the `unsafe_op_in_unsafe_fn` lint, which checks whether the unsafe code in an `unsafe fn` is wrapped in a `unsafe` block.][79208] This lint is allowed by default, and may become a warning or hard error in a future edition. - [You can now cast mutable references to arrays to a pointer of the same type as the element.][81479] Compiler -------- - [Upgraded the default LLVM to LLVM 12.][81451] Added tier 3\* support for the following targets. - [`s390x-unknown-linux-musl`][82166] - [`riscv32gc-unknown-linux-musl` & `riscv64gc-unknown-linux-musl`][82202] - [`powerpc-unknown-openbsd`][82733] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [`OsString` now implements `Extend` and `FromIterator`.][82121] - [`cmp::Reverse` now has `#[repr(transparent)]` representation.][81879] - [`Arc<impl Error>` now implements `error::Error`.][80553] - [All integer division and remainder operations are now `const`.][80962] Stabilised APIs ------------- - [`Arguments::as_str`] - [`char::MAX`] - [`char::REPLACEMENT_CHARACTER`] - [`char::UNICODE_VERSION`] - [`char::decode_utf16`] - [`char::from_digit`] - [`char::from_u32_unchecked`] - [`char::from_u32`] - [`slice::partition_point`] - [`str::rsplit_once`] - [`str::split_once`] The following previously stable APIs are now `const`. - [`char::len_utf8`] - [`char::len_utf16`] - [`char::to_ascii_uppercase`] - [`char::to_ascii_lowercase`] - [`char::eq_ignore_ascii_case`] - [`u8::to_ascii_uppercase`] - [`u8::to_ascii_lowercase`] - [`u8::eq_ignore_ascii_case`] Rustdoc ------- - [Rustdoc lints are now treated as a tool lint, meaning that lints are now prefixed with `rustdoc::` (e.g. `#[warn(rustdoc::non_autolinks)]`).][80527] Using the old style is still allowed, and will become a warning in a future release. - [Rustdoc now supports argument files.][82261] - [Rustdoc now generates smart punctuation for documentation.][79423] - [You can now use "task lists" in Rustdoc Markdown.][81766] E.g. ```markdown - [x] Complete - [ ] Todo ``` Misc ---- - [You can now pass multiple filters to tests.][81356] E.g. `cargo test -- foo bar` will run all tests that match `foo` and `bar`. - [Rustup now distributes PDB symbols for the `std` library on Windows, allowing you to see `std` symbols when debugging.][82218] Internal Only ------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Check the result cache before the DepGraph when ensuring queries][81855] - [Try fast_reject::simplify_type in coherence before doing full check][81744] - [Only store a LocalDefId in some HIR nodes][81611] - [Store HIR attributes in a side table][79519] Compatibility Notes ------------------- - [Cargo build scripts are now forbidden from setting `RUSTC_BOOTSTRAP`.][cargo/9181] - [Removed support for the `x86_64-rumprun-netbsd` target.][82594] - [Deprecated the `x86_64-sun-solaris` target in favor of `x86_64-pc-solaris`.][82216] - [Rustdoc now only accepts `,`, ` `, and `\t` as delimiters for specifying languages in code blocks.][78429] - [Rustc now catches more cases of `pub_use_of_private_extern_crate`][80763] - [Changes in how proc macros handle whitespace may lead to panics when used with older `proc-macro-hack` versions. A `cargo update` should be sufficient to fix this in all cases.][84136] [84136]: rust-lang/rust#84136 [80763]: rust-lang/rust#80763 [82166]: rust-lang/rust#82166 [82121]: rust-lang/rust#82121 [81879]: rust-lang/rust#81879 [82261]: rust-lang/rust#82261 [82218]: rust-lang/rust#82218 [82216]: rust-lang/rust#82216 [82202]: rust-lang/rust#82202 [81855]: rust-lang/rust#81855 [81766]: rust-lang/rust#81766 [81744]: rust-lang/rust#81744 [81611]: rust-lang/rust#81611 [81479]: rust-lang/rust#81479 [81451]: rust-lang/rust#81451 [81356]: rust-lang/rust#81356 [80962]: rust-lang/rust#80962 [80553]: rust-lang/rust#80553 [80527]: rust-lang/rust#80527 [79519]: rust-lang/rust#79519 [79423]: rust-lang/rust#79423 [79208]: rust-lang/rust#79208 [78429]: rust-lang/rust#78429 [82733]: rust-lang/rust#82733 [82594]: rust-lang/rust#82594 [cargo/9181]: rust-lang/cargo#9181 [`char::MAX`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.MAX [`char::REPLACEMENT_CHARACTER`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.REPLACEMENT_CHARACTER [`char::UNICODE_VERSION`]: https://doc.rust-lang.org/std/primitive.char.html#associatedconstant.UNICODE_VERSION [`char::decode_utf16`]: https://doc.rust-lang.org/std/primitive.char.html#method.decode_utf16 [`char::from_u32`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32 [`char::from_u32_unchecked`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_u32_unchecked [`char::from_digit`]: https://doc.rust-lang.org/std/primitive.char.html#method.from_digit [`Peekable::next_if`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if [`Peekable::next_if_eq`]: https://doc.rust-lang.org/stable/std/iter/struct.Peekable.html#method.next_if_eq [`Arguments::as_str`]: https://doc.rust-lang.org/stable/std/fmt/struct.Arguments.html#method.as_str [`str::split_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.split_once [`str::rsplit_once`]: https://doc.rust-lang.org/stable/std/primitive.str.html#method.rsplit_once [`slice::partition_point`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.partition_point [`char::len_utf8`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf8 [`char::len_utf16`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.len_utf16 [`char::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_uppercase [`char::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.to_ascii_lowercase [`char::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.char.html#method.eq_ignore_ascii_case [`u8::to_ascii_uppercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_uppercase [`u8::to_ascii_lowercase`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ascii_lowercase [`u8::eq_ignore_ascii_case`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.eq_ignore_ascii_case

jyn514 · 2021-11-28T05:23:42Z

Sorry, you had a question about the link (sometimes GitHub doesn't have a response field for inline comments).

@ehuss Took me ages but I figured this out - if you start a review, GitHub will only let you reply to existing comments if the response becomes part of the review, so you have to be in the diff view instead of the overview tab.

rust-highfive assigned joshtriplett Feb 17, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2021

jyn514 force-pushed the computer-says-no branch from 550e86f to 4413f87 Compare February 17, 2021 17:45

jyn514 commented Feb 17, 2021

View reviewed changes

src/cargo/core/compiler/custom_build.rs Outdated Show resolved Hide resolved

src/cargo/core/features.rs Outdated Show resolved Hide resolved

tests/testsuite/build_script_env.rs Outdated Show resolved Hide resolved

jyn514 force-pushed the computer-says-no branch from 4413f87 to c0c05e1 Compare February 17, 2021 17:52

jyn514 force-pushed the computer-says-no branch 3 times, most recently from 4c287b2 to 3455713 Compare February 19, 2021 01:13

jyn514 force-pushed the computer-says-no branch from 3455713 to ffe63c9 Compare February 23, 2021 16:10

jyn514 force-pushed the computer-says-no branch from ffe63c9 to 2a97534 Compare February 23, 2021 23:08

ehuss reviewed Feb 24, 2021

View reviewed changes

src/cargo/core/compiler/custom_build.rs Outdated Show resolved Hide resolved

src/cargo/core/compiler/custom_build.rs Outdated Show resolved Hide resolved

crates/cargo-test-support/src/lib.rs Outdated Show resolved Hide resolved

jyn514 added 6 commits February 24, 2021 14:43

Restrict RUSTC_BOOTSTRAP in build.rs

6c422a2

Downgrade error to a warning when RUSTC_BOOTSTRAP is set or this is…

418129d

… the nightly channel

Remove unused thread_locals

8fc86e1

Compute enable_nightly_features once instead of on each call

169b09c

This avoids reparsing `channel()` over and over again. It also makes `maybe_enable_nightly_features` unnecessary and removes it.

jyn514 commented Feb 24, 2021

View reviewed changes

src/cargo/core/compiler/custom_build.rs Outdated Show resolved Hide resolved

crates/cargo-test-support/src/lib.rs Outdated Show resolved Hide resolved

jyn514 force-pushed the computer-says-no branch 2 times, most recently from ec0714b to 34f8b63 Compare February 24, 2021 20:02

jyn514 added 2 commits February 24, 2021 15:11

Make nightly_features_allowed a field instead of a function

a572011

`nightly_features_allowed()` is no longer doing any work, so it can be accessed directly. This also renames the `enable_nightly_features` field to `nightly_features_allowed`.

Update comment in build_script_env

eba5419

jyn514 added 2 commits February 24, 2021 17:38

Fix TODO about nightly features

3a86ecf

Remove unnecessary config argument to Features::add

a6394bc

The info was already present on `self`. Note that this uses a temporary variable to avoid a borrowck error from `slot`.

jyn514 force-pushed the computer-says-no branch from 93ab47f to 61a00ac Compare February 25, 2021 17:56

jyn514 force-pushed the computer-says-no branch from 61a00ac to 5a2b7bc Compare February 26, 2021 01:42

ehuss reviewed Mar 3, 2021

View reviewed changes

src/cargo/core/compiler/custom_build.rs Outdated Show resolved Hide resolved

Remove unhelpful link to Cargo book

0b18165

It didn't have any information about RUSTC_BOOTSTRAP itself, only the general `rustc-env` feature.

jyn514 force-pushed the computer-says-no branch from 5a2b7bc to 0b18165 Compare March 3, 2021 01:04

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 Mar 3, 2021

bors merged commit b219f0e into rust-lang:master Mar 3, 2021

jyn514 deleted the computer-says-no branch March 3, 2021 03:46

bors mentioned this pull request Mar 3, 2021

Support [patch] in .cargo/config files #9204

Merged

Xanewok mentioned this pull request Mar 9, 2021

Update Cargo rust-lang/rls#1723

Merged

jyn514 mentioned this pull request Mar 9, 2021

rls no longer builds after rust-lang/rust#82929 rust-lang/rust#82932

Closed

bors added a commit to rust-lang/rls that referenced this pull request Mar 10, 2021

Auto merge of #1723 - Xanewok:update-cargo, r=jyn514

78a36bd

Update Cargo Fixes breakage caused by rust-lang/cargo#9181.

jrmuizel mentioned this pull request Mar 29, 2021

Tracking issue for stable SIMD in Rust rust-lang/rust#48556

Closed

3 tasks

jyn514 mentioned this pull request Apr 15, 2021

Update RELEASES.md for 1.52.0 rust-lang/rust#84183

Merged

ehuss mentioned this pull request Apr 16, 2021

Cargo misleads users when RUSTC_BOOTSTRAP set by build script #9362

Closed

jyn514 mentioned this pull request Apr 16, 2021

Don't give a hard error when the end-user specifies RUSTC_BOOTSTRAP=crate_name #9365

Merged

ehuss added this to the 1.52.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Forbid setting `RUSTC_BOOTSTRAP` from a build script on stable #9181

Forbid setting `RUSTC_BOOTSTRAP` from a build script on stable #9181

jyn514 commented Feb 17, 2021 •

edited

Loading

jyn514 commented Feb 17, 2021

joshtriplett commented Feb 18, 2021

ehuss commented Feb 18, 2021

jyn514 commented Feb 18, 2021

jyn514 commented Feb 18, 2021

jyn514 commented Feb 23, 2021

bors commented Feb 23, 2021

bors commented Feb 23, 2021

ehuss left a comment

jyn514 left a comment

jyn514 commented Feb 26, 2021

ehuss commented Mar 2, 2021

jyn514 commented Mar 3, 2021 •

edited

Loading

ehuss commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

jyn514 commented Nov 28, 2021

Forbid setting RUSTC_BOOTSTRAP from a build script on stable #9181

Forbid setting RUSTC_BOOTSTRAP from a build script on stable #9181

Conversation

jyn514 commented Feb 17, 2021 • edited Loading

jyn514 commented Feb 17, 2021

joshtriplett commented Feb 18, 2021

ehuss commented Feb 18, 2021

jyn514 commented Feb 18, 2021

jyn514 commented Feb 18, 2021

jyn514 commented Feb 23, 2021

bors commented Feb 23, 2021

bors commented Feb 23, 2021

ehuss left a comment

Choose a reason for hiding this comment

jyn514 left a comment

Choose a reason for hiding this comment

jyn514 commented Feb 26, 2021

ehuss commented Mar 2, 2021

jyn514 commented Mar 3, 2021 • edited Loading

ehuss commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

bors commented Mar 3, 2021

jyn514 commented Nov 28, 2021

Forbid setting `RUSTC_BOOTSTRAP` from a build script on stable #9181

Forbid setting `RUSTC_BOOTSTRAP` from a build script on stable #9181

jyn514 commented Feb 17, 2021 •

edited

Loading

jyn514 commented Mar 3, 2021 •

edited

Loading