-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Don't require allow_internal_unstable
unless staged_api
is enabled.
#68114
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This flag opts out of the min-const-fn checks entirely, which is usually not what we want. The few cases where the flag is still necessary have been annotated.
Centril
reviewed
Jan 11, 2020
r=me with comment ^-- added. |
If you can follow up with changes to the rustc guide that'd be great. |
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
I'll r+ on your behalf once this passes CI. There might be some bootstrap problems now that the |
@bors r=Centril |
📌 Commit fc30825 has been approved by |
bors
added
the
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Jan 11, 2020
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
…r=Centril Don't require `allow_internal_unstable` unless `staged_api` is enabled. rust-lang#63770 changed `qualify_min_const_fn` to require `allow_internal_unstable` for *all* crates that used an unstable feature, regardless of whether `staged_api` was enabled or the `fn` that used that feature was stably const. In practice, this meant that every crate in the ecosystem that wanted to use nightly features added `#![feature(const_fn)]`, which skips `qualify_min_const_fn` entirely. After this PR, crates that do not have `#![feature(staged_api)]` will only need to enable the feature they are interested in. For example, `#![feature(const_if_match)]` will be enough to enable `if` and `match` in constants. Crates with `staged_api` (e.g., `libstd`) require `#[allow_internal_unstable]` to be added to a function if it uses nightly features unless that function is also marked `#[rustc_const_unstable]`. This prevents proliferation of `#[allow_internal_unstable]` into functions that are not callable in a `const` context on stable. r? @oli-obk (author of rust-lang#63770) cc @Centril
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
…r=Centril Don't require `allow_internal_unstable` unless `staged_api` is enabled. rust-lang#63770 changed `qualify_min_const_fn` to require `allow_internal_unstable` for *all* crates that used an unstable feature, regardless of whether `staged_api` was enabled or the `fn` that used that feature was stably const. In practice, this meant that every crate in the ecosystem that wanted to use nightly features added `#![feature(const_fn)]`, which skips `qualify_min_const_fn` entirely. After this PR, crates that do not have `#![feature(staged_api)]` will only need to enable the feature they are interested in. For example, `#![feature(const_if_match)]` will be enough to enable `if` and `match` in constants. Crates with `staged_api` (e.g., `libstd`) require `#[allow_internal_unstable]` to be added to a function if it uses nightly features unless that function is also marked `#[rustc_const_unstable]`. This prevents proliferation of `#[allow_internal_unstable]` into functions that are not callable in a `const` context on stable. r? @oli-obk (author of rust-lang#63770) cc @Centril
bors
added a commit
that referenced
this pull request
Jan 11, 2020
Rollup of 9 pull requests Successful merges: - #67000 (Promote references to constants instead of statics) - #67756 (Collector tweaks) - #67889 (Compile some CGUs in parallel at the start of codegen) - #67930 (Rename Result::as_deref_ok to as_deref) - #68018 (feature_gate: Remove `GateStrength`) - #68070 (clean up E0185 explanation) - #68072 (Fix ICE #68058) - #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.) - #68120 (Ban `...X` pats, harden tests, and improve diagnostics) Failed merges: r? @ghost
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
…r=Centril Don't require `allow_internal_unstable` unless `staged_api` is enabled. rust-lang#63770 changed `qualify_min_const_fn` to require `allow_internal_unstable` for *all* crates that used an unstable feature, regardless of whether `staged_api` was enabled or the `fn` that used that feature was stably const. In practice, this meant that every crate in the ecosystem that wanted to use nightly features added `#![feature(const_fn)]`, which skips `qualify_min_const_fn` entirely. After this PR, crates that do not have `#![feature(staged_api)]` will only need to enable the feature they are interested in. For example, `#![feature(const_if_match)]` will be enough to enable `if` and `match` in constants. Crates with `staged_api` (e.g., `libstd`) require `#[allow_internal_unstable]` to be added to a function if it uses nightly features unless that function is also marked `#[rustc_const_unstable]`. This prevents proliferation of `#[allow_internal_unstable]` into functions that are not callable in a `const` context on stable. r? @oli-obk (author of rust-lang#63770) cc @Centril
bors
added a commit
that referenced
this pull request
Jan 11, 2020
Rollup of 8 pull requests Successful merges: - #67756 (Collector tweaks) - #67889 (Compile some CGUs in parallel at the start of codegen) - #67930 (Rename Result::as_deref_ok to as_deref) - #68018 (feature_gate: Remove `GateStrength`) - #68070 (clean up E0185 explanation) - #68072 (Fix ICE #68058) - #68114 (Don't require `allow_internal_unstable` unless `staged_api` is enabled.) - #68120 (Ban `...X` pats, harden tests, and improve diagnostics) Failed merges: r? @ghost
Note that currently there is a workaround using macros: #![feature(allow_internal_unstable)]
#[allow_internal_unstable(const_transmute)]
macro_rules! transmute {
($e: expr) => {
std::mem::transmute($e)
};
}
#[allow_internal_unstable(wrapping_next_power_of_two)]
macro_rules! wrapping_next_power_of_two {
($e: expr) => {
$e.wrapping_next_power_of_two()
};
}
fn g(a: u64) -> u64 {
wrapping_next_power_of_two!(a)
}
const fn h(a: u64) -> i64 {
unsafe { transmute!(a) }
} |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#63770 changed
qualify_min_const_fn
to requireallow_internal_unstable
for all crates that used an unstable feature, regardless of whetherstaged_api
was enabled or thefn
that used that feature was stably const. In practice, this meant that every crate in the ecosystem that wanted to use nightly features added#![feature(const_fn)]
, which skipsqualify_min_const_fn
entirely.After this PR, crates that do not have
#![feature(staged_api)]
will only need to enable the feature they are interested in. For example,#![feature(const_if_match)]
will be enough to enableif
andmatch
in constants. Crates withstaged_api
(e.g.,libstd
) require#[allow_internal_unstable]
to be added to a function if it uses nightly features unless that function is also marked#[rustc_const_unstable]
. This prevents proliferation of#[allow_internal_unstable]
into functions that are not callable in aconst
context on stable.r? @oli-obk (author of #63770)
cc @Centril