Support `cfg` and `cfg_attr` on generic parameters #61547

petrochenkov · 2019-06-05T15:34:13Z

cfg attributes are supported in all other positions where attributes are accepted at all.

They were previously prohibited in #51283 because they weren't implemented correctly before that and were simply ignored.

rust-highfive · 2019-06-05T15:34:25Z

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

src/libsyntax/config.rs

Centril · 2019-06-05T15:56:00Z

I don't know whether we have any lint check attributes that affect generic parameters, but how does the language interact with those before / after this PR?

Centril · 2019-06-05T15:57:56Z

I see no reason not to do this and every reason to both in terms of consistency and usability. That said, since it is a language change, let's formally approve this change...

@rfcbot merge

rfcbot · 2019-06-05T15:57:59Z

Team member @Centril has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

Centril · 2019-06-05T15:58:24Z

N.B. Aaron is on leave so I've checked their box.

petrochenkov · 2019-06-05T16:46:36Z

@Centril

I don't know whether we have any lint check attributes that affect generic parameters, but how does the language interact with those before / after this PR?

This change is orthogonal to lint checking attributes.
allow/deny and friends still don't work on generic parameters (which is a bug, but low priority).

fn f<#[allow(warnings)] foo>() {} // warning: type parameter `foo` should have an upper camel case name

Centril · 2019-06-05T16:47:58Z

This change is orthogonal to lint checking attributes.

Thanks! Would you mind filing an issue if there isn't one already?

petrochenkov · 2019-06-05T16:51:26Z

Would you mind filing an issue if there isn't one already?

#61552

rfcbot · 2019-06-09T03:17:32Z

🔔 This is now entering its final comment period, as per the review above. 🔔

Centril · 2019-06-10T01:22:00Z

r? @Centril

r=me rollup on the implementation when FCP completes.

bors · 2019-06-12T10:44:29Z

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

rfcbot · 2019-06-19T03:42:41Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

petrochenkov · 2019-06-19T08:36:57Z

@bors r=Centril rollup

bors · 2019-06-19T08:36:58Z

📌 Commit 0b58bb3 has been approved by Centril

Support `cfg` and `cfg_attr` on generic parameters `cfg` attributes are supported in all other positions where attributes are accepted at all. They were previously prohibited in rust-lang#51283 because they weren't implemented correctly before that and were simply ignored.

@ghost

Rollup of 4 pull requests Successful merges: - #60667 ( Add functions for building raw slices to libcore ) - #61547 (Support `cfg` and `cfg_attr` on generic parameters) - #61861 (Update rustfmt and rls) - #61940 (Make Place::ty iterate) Failed merges: r? @ghost

Pkgsrc changes: * Add a patch to llvm to deal with const dli_saddr. * Adapt two other patches. * Cross-build currently fails, so i386, powerpc and sparc64 bootstrap kits for 1.37.0 are built natively. Missing aarch64 hardware, so that's not available yet. * Bump bootstrap requirements to 1.36.0 except for armv7-unknown-netbsd-eabihf which I've not managed to cross-build. Upstream changes: Version 1.37.0 (2019-08-15) ========================== Language -------- - `#[must_use]` will now warn if the type is contained in a [tuple][61100], [`Box`][62228], or an [array][62235] and unused. - [You can now use the `cfg` and `cfg_attr` attributes on generic parameters.][61547] - [You can now use enum variants through type alias.][61682] e.g. You can write the following: ```rust type MyOption = Option<u8>; fn increment_or_zero(x: MyOption) -> u8 { match x { MyOption::Some(y) => y + 1, MyOption::None => 0, } } ``` - [You can now use `_` as an identifier for consts.][61347] e.g. You can write `const _: u32 = 5;`. - [You can now use `#[repr(align(X)]` on enums.][61229] - [The `?`/_"Kleene"_ macro operator is now available in the 2015 edition.][60932] Compiler -------- - [You can now enable Profile-Guided Optimization with the `-C profile-generate` and `-C profile-use` flags.][61268] For more information on how to use profile guided optimization, please refer to the [rustc book][rustc-book-pgo]. - [The `rust-lldb` wrapper script should now work again.][61827] Libraries --------- - [`mem::MaybeUninit<T>` is now ABI-compatible with `T`.][61802] Stabilized APIs --------------- - [`BufReader::buffer`] - [`BufWriter::buffer`] - [`Cell::from_mut`] - [`Cell<[T]>::as_slice_of_cells`][`Cell<slice>::as_slice_of_cells`] - [`DoubleEndedIterator::nth_back`] - [`Option::xor`] - [`Wrapping::reverse_bits`] - [`i128::reverse_bits`] - [`i16::reverse_bits`] - [`i32::reverse_bits`] - [`i64::reverse_bits`] - [`i8::reverse_bits`] - [`isize::reverse_bits`] - [`slice::copy_within`] - [`u128::reverse_bits`] - [`u16::reverse_bits`] - [`u32::reverse_bits`] - [`u64::reverse_bits`] - [`u8::reverse_bits`] - [`usize::reverse_bits`] Cargo ----- - [`Cargo.lock` files are now included by default when publishing executable crates with executables.][cargo/7026] - [You can now specify `default-run="foo"` in `[package]` to specify the default executable to use for `cargo run`.][cargo/7056] Misc ---- Compatibility Notes ------------------- - [Using `...` for inclusive range patterns will now warn by default.][61342] Please transition your code to using the `..=` syntax for inclusive ranges instead. - [Using a trait object without the `dyn` will now warn by default.][61203] Please transition your code to use `dyn Trait` for trait objects instead. [62228]: rust-lang/rust#62228 [62235]: rust-lang/rust#62235 [61802]: rust-lang/rust#61802 [61827]: rust-lang/rust#61827 [61547]: rust-lang/rust#61547 [61682]: rust-lang/rust#61682 [61268]: rust-lang/rust#61268 [61342]: rust-lang/rust#61342 [61347]: rust-lang/rust#61347 [61100]: rust-lang/rust#61100 [61203]: rust-lang/rust#61203 [61229]: rust-lang/rust#61229 [60932]: rust-lang/rust#60932 [cargo/7026]: rust-lang/cargo#7026 [cargo/7056]: rust-lang/cargo#7056 [`BufReader::buffer`]: https://doc.rust-lang.org/std/io/struct.BufReader.html#method.buffer [`BufWriter::buffer`]: https://doc.rust-lang.org/std/io/struct.BufWriter.html#method.buffer [`Cell::from_mut`]: https://doc.rust-lang.org/std/cell/struct.Cell.html#method.from_mut [`Cell<slice>::as_slice_of_cells`]: https://doc.rust-lang.org/std/cell/struct.Cell.html#method.as_slice_of_cells [`DoubleEndedIterator::nth_back`]: https://doc.rust-lang.org/std/iter/trait.DoubleEndedIterator.html#method.nth_back [`Option::xor`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.xor [`RefCell::try_borrow_unguarded`]: https://doc.rust-lang.org/std/cell/struct.RefCell.html#method.try_borrow_unguarded [`Wrapping::reverse_bits`]: https://doc.rust-lang.org/std/num/struct.Wrapping.html#method.reverse_bits [`i128::reverse_bits`]: https://doc.rust-lang.org/std/primitive.i128.html#method.reverse_bits [`i16::reverse_bits`]: https://doc.rust-lang.org/std/primitive.i16.html#method.reverse_bits [`i32::reverse_bits`]: https://doc.rust-lang.org/std/primitive.i32.html#method.reverse_bits [`i64::reverse_bits`]: https://doc.rust-lang.org/std/primitive.i64.html#method.reverse_bits [`i8::reverse_bits`]: https://doc.rust-lang.org/std/primitive.i8.html#method.reverse_bits [`isize::reverse_bits`]: https://doc.rust-lang.org/std/primitive.isize.html#method.reverse_bits [`slice::copy_within`]: https://doc.rust-lang.org/std/primitive.slice.html#method.copy_within [`u128::reverse_bits`]: https://doc.rust-lang.org/std/primitive.u128.html#method.reverse_bits [`u16::reverse_bits`]: https://doc.rust-lang.org/std/primitive.u16.html#method.reverse_bits [`u32::reverse_bits`]: https://doc.rust-lang.org/std/primitive.u32.html#method.reverse_bits [`u64::reverse_bits`]: https://doc.rust-lang.org/std/primitive.u64.html#method.reverse_bits [`u8::reverse_bits`]: https://doc.rust-lang.org/std/primitive.u8.html#method.reverse_bits [`usize::reverse_bits`]: https://doc.rust-lang.org/std/primitive.usize.html#method.reverse_bits [rustc-book-pgo]: https://doc.rust-lang.org/rustc/profile-guided-optimization.html

rust-highfive assigned pnkfelix Jun 5, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2019

Centril reviewed Jun 5, 2019

View reviewed changes

src/libsyntax/config.rs Outdated Show resolved Hide resolved

Centril added relnotes Marks issues that should be documented in the release notes of the next release. T-lang Relevant to the language team, which will review and decide on the PR/issue. labels Jun 5, 2019

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Jun 5, 2019

Centril added the I-nominated label Jun 5, 2019

petrochenkov force-pushed the cfgen branch from 8c79a0c to f74a0a5 Compare June 5, 2019 16:56

Centril removed the I-nominated label Jun 6, 2019

Centril added this to the 1.37 milestone Jun 7, 2019

rfcbot added the final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. label Jun 9, 2019

rfcbot removed the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Jun 9, 2019

Centril added S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 10, 2019

rust-highfive assigned Centril and unassigned pnkfelix Jun 10, 2019

Centril added S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. and removed S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Jun 13, 2019

rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Jun 19, 2019

Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. labels Jun 19, 2019

Support cfg and cfg_attr on generic parameters

0b58bb3

petrochenkov force-pushed the cfgen branch from f74a0a5 to 0b58bb3 Compare June 19, 2019 08:36

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2019

Centril mentioned this pull request Jun 19, 2019

Rollup of 3 pull requests #61957

Closed

Centril mentioned this pull request Jun 19, 2019

Rollup of 4 pull requests #61962

Merged

bors merged commit 0b58bb3 into rust-lang:master Jun 19, 2019

ehuss mentioned this pull request Jun 20, 2019

Update for cfg on generic parameter. rust-lang/reference#624

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support `cfg` and `cfg_attr` on generic parameters #61547

Support `cfg` and `cfg_attr` on generic parameters #61547

petrochenkov commented Jun 5, 2019

rust-highfive commented Jun 5, 2019

Centril commented Jun 5, 2019

Centril commented Jun 5, 2019

rfcbot commented Jun 5, 2019 •

edited by eddyb

Loading

Centril commented Jun 5, 2019

petrochenkov commented Jun 5, 2019

Centril commented Jun 5, 2019

petrochenkov commented Jun 5, 2019

rfcbot commented Jun 9, 2019

Centril commented Jun 10, 2019

bors commented Jun 12, 2019

rfcbot commented Jun 19, 2019

petrochenkov commented Jun 19, 2019

bors commented Jun 19, 2019

Support cfg and cfg_attr on generic parameters #61547

Support cfg and cfg_attr on generic parameters #61547

Conversation

petrochenkov commented Jun 5, 2019

rust-highfive commented Jun 5, 2019

Centril commented Jun 5, 2019

Centril commented Jun 5, 2019

rfcbot commented Jun 5, 2019 • edited by eddyb Loading

Centril commented Jun 5, 2019

petrochenkov commented Jun 5, 2019

Centril commented Jun 5, 2019

petrochenkov commented Jun 5, 2019

rfcbot commented Jun 9, 2019

Centril commented Jun 10, 2019

bors commented Jun 12, 2019

rfcbot commented Jun 19, 2019

petrochenkov commented Jun 19, 2019

bors commented Jun 19, 2019

Support `cfg` and `cfg_attr` on generic parameters #61547

Support `cfg` and `cfg_attr` on generic parameters #61547

rfcbot commented Jun 5, 2019 •

edited by eddyb

Loading