stabilize cfg_attr_multi #57332

Dylan-DPC-zz · 2019-01-04T07:16:42Z

Stabilizes cfg_attr_multi feature

Related to #54881

Will add the lint in a seperate PR

r? @Centril

src/test/ui/conditional-compilation/cfg-attr-multi-false.rs

src/test/ui/conditional-compilation/cfg-attr-parse.rs

src/libsyntax/feature_gate.rs

Centril · 2019-01-04T21:32:40Z

You have some merge conflicts that'll need to be resolved by rebasing; other than that it looks good.

Dylan-DPC-zz · 2019-01-05T07:05:57Z

Damn some issue with the rebase.. let me try again

src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs

Centril · 2019-01-08T05:39:37Z

Looks good; thanks!

Giving prio to this since it's a stabilization.

@bors r+ p=1

bors · 2019-01-08T05:39:37Z

📌 Commit 13f8ad8 has been approved by Centril

bors · 2019-01-08T07:49:23Z

⌛ Testing commit 13f8ad8 with merge 7ad470c...

@Centril

stabilize cfg_attr_multi Stabilizes cfg_attr_multi feature Related to #54881 Will add the lint in a seperate PR r? @Centril

bors · 2019-01-08T10:29:07Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Centril
Pushing 7ad470c to master...

rust-highfive · 2019-01-08T10:31:51Z

📣 Toolstate changed by #57332!

Tested on commit 7ad470c.
Direct link to PR: #57332

💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

@nrc

Tested on commit rust-lang/rust@7ad470c. Direct link to PR: <rust-lang/rust#57332> 💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

Xanewok · 2019-01-08T10:40:44Z

I believe this is spurious, (un?)fortunately:

thread 'cmd_changing_workspace_lib_retains_bin_diagnostics' panicked at 'expected bin error diagnostic', src/libcore/option.rs:1040:5

Pkgsrc changes: * Bump required rust version to build to 1.32.0. * Adapt patches to changed file locations. * Since we now patch some more vendor/ modules, doctor the corresponding .cargo-checksum.json files accordingly Upstream changes: Version 1.33.0 (2019-02-28) ========================== Language -------- - [You can now use the `cfg(target_vendor)` attribute.][57465] E.g. `#[cfg(target_vendor="apple")] fn main() { println!("Hello Apple!"); }` - [Integer patterns such as in a match expression can now be exhaustive.][56362] E.g. You can have match statement on a `u8` that covers `0..=255` and you would no longer be required to have a `_ => unreachable!()` case. - [You can now have multiple patterns in `if let` and `while let` expressions.][57532] You can do this with the same syntax as a `match` expression. E.g. ```rust enum Creature { Crab(String), Lobster(String), Person(String), } fn main() { let state = Creature::Crab("Ferris"); if let Creature::Crab(name) | Creature::Person(name) = state { println!("This creature's name is: {}", name); } } ``` - [You can now have irrefutable `if let` and `while let` patterns.][57535] Using this feature will by default produce a warning as this behaviour can be unintuitive. E.g. `if let _ = 5 {}` - [You can now use `let` bindings, assignments, expression statements, and irrefutable pattern destructuring in const functions.][57175] - [You can now call unsafe const functions.][57067] E.g. ```rust const unsafe fn foo() -> i32 { 5 } const fn bar() -> i32 { unsafe { foo() } } ``` - [You can now specify multiple attributes in a `cfg_attr` attribute.][57332] E.g. `#[cfg_attr(all(), must_use, optimize)]` - [You can now specify a specific alignment with the `#[repr(packed)]` attribute.][57049] E.g. `#[repr(packed(2))] struct Foo(i16, i32);` is a struct with an alignment of 2 bytes and a size of 6 bytes. - [You can now import an item from a module as an `_`.][56303] This allows you to import a trait's impls, and not have the name in the namespace. E.g. ```rust use std::io::Read as _; // Allowed as there is only one `Read` in the module. pub trait Read {} ``` - [You may now use `Rc`, `Arc`, and `Pin` as method receivers][56805]. Compiler -------- - [You can now set a linker flavor for `rustc` with the `-Clinker-flavor` command line argument.][56351] - [The mininum required LLVM version has been bumped to 6.0.][56642] - [Added support for the PowerPC64 architecture on FreeBSD.][57615] - [The `x86_64-fortanix-unknown-sgx` target support has been upgraded to tier 2 support.][57130] Visit the [platform support][platform-support] page for information on Rust's platform support. - [Added support for the `thumbv7neon-linux-androideabi` and `thumbv7neon-unknown-linux-gnueabihf` targets.][56947] - [Added support for the `x86_64-unknown-uefi` target.][56769] Libraries --------- - [The methods `overflowing_{add, sub, mul, shl, shr}` are now `const` functions for all numeric types.][57566] - [The methods `rotate_left`, `rotate_right`, and `wrapping_{add, sub, mul, shl, shr}` are now `const` functions for all numeric types.][57105] - [The methods `is_positive` and `is_negative` are now `const` functions for all signed numeric types.][57105] - [The `get` method for all `NonZero` types is now `const`.][57167] - [The methods `count_ones`, `count_zeros`, `leading_zeros`, `trailing_zeros`, `swap_bytes`, `from_be`, `from_le`, `to_be`, `to_le` are now `const` for all numeric types.][57234] - [`Ipv4Addr::new` is now a `const` function][57234] Stabilized APIs --------------- - [`unix::FileExt::read_exact_at`] - [`unix::FileExt::write_all_at`] - [`Option::transpose`] - [`Result::transpose`] - [`convert::identity`] - [`pin::Pin`] - [`marker::Unpin`] - [`marker::PhantomPinned`] - [`Vec::resize_with`] - [`VecDeque::resize_with`] - [`Duration::as_millis`] - [`Duration::as_micros`] - [`Duration::as_nanos`] Cargo ----- - [Cargo should now rebuild a crate if a file was modified during the initial build.][cargo/6484] Compatibility Notes ------------------- - The methods `str::{trim_left, trim_right, trim_left_matches, trim_right_matches}` are now deprecated in the standard library, and their usage will now produce a warning. Please use the `str::{trim_start, trim_end, trim_start_matches, trim_end_matches}` methods instead. - The `Error::cause` method has been deprecated in favor of `Error::source` which supports downcasting. [55982]: rust-lang/rust#55982 [56303]: rust-lang/rust#56303 [56351]: rust-lang/rust#56351 [56362]: rust-lang/rust#56362 [56642]: rust-lang/rust#56642 [56769]: rust-lang/rust#56769 [56805]: rust-lang/rust#56805 [56947]: rust-lang/rust#56947 [57049]: rust-lang/rust#57049 [57067]: rust-lang/rust#57067 [57105]: rust-lang/rust#57105 [57130]: rust-lang/rust#57130 [57167]: rust-lang/rust#57167 [57175]: rust-lang/rust#57175 [57234]: rust-lang/rust#57234 [57332]: rust-lang/rust#57332 [57465]: rust-lang/rust#57465 [57532]: rust-lang/rust#57532 [57535]: rust-lang/rust#57535 [57566]: rust-lang/rust#57566 [57615]: rust-lang/rust#57615 [cargo/6484]: rust-lang/cargo#6484 [`unix::FileExt::read_exact_at`]: https://doc.rust-lang.org/std/os/unix/fs/trait.FileExt.html#method.read_exact_at [`unix::FileExt::write_all_at`]: https://doc.rust-lang.org/std/os/unix/fs/trait.FileExt.html#method.write_all_at [`Option::transpose`]: https://doc.rust-lang.org/std/option/enum.Option.html#method.transpose [`Result::transpose`]: https://doc.rust-lang.org/std/result/enum.Result.html#method.transpose [`convert::identity`]: https://doc.rust-lang.org/std/convert/fn.identity.html [`pin::Pin`]: https://doc.rust-lang.org/std/pin/struct.Pin.html [`marker::Unpin`]: https://doc.rust-lang.org/stable/std/marker/trait.Unpin.html [`marker::PhantomPinned`]: https://doc.rust-lang.org/nightly/std/marker/struct.PhantomPinned.html [`Vec::resize_with`]: https://doc.rust-lang.org/std/vec/struct.Vec.html#method.resize_with [`VecDeque::resize_with`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.resize_with [`Duration::as_millis`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_millis [`Duration::as_micros`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_micros [`Duration::as_nanos`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_nanos [platform-support]: https://forge.rust-lang.org/platform-support.html

rust-highfive assigned Centril Jan 4, 2019

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

This comment has been minimized.

Sign in to view

petrochenkov reviewed Jan 4, 2019

View reviewed changes

src/test/ui/conditional-compilation/cfg-attr-multi-false.rs Outdated Show resolved Hide resolved

Centril reviewed Jan 4, 2019

View reviewed changes

src/test/ui/conditional-compilation/cfg-attr-parse.rs Outdated Show resolved Hide resolved

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

Centril added the relnotes Marks issues that should be documented in the release notes of the next release. label Jan 4, 2019

Dylan-DPC-zz force-pushed the feature/stabilise-cfg-attr branch from f148a68 to fdc2f54 Compare January 5, 2019 08:45

This comment has been minimized.

Sign in to view

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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 5, 2019

Centril reviewed Jan 5, 2019

View reviewed changes

src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Dylan-DPC added 4 commits January 8, 2019 00:17

stabilise cfg_attr

1ef99f1

remove unused imports and feature gate from tests

64a17a0

remove unwanted stage0 line, fix style

6ddd2cd

bless you

13f8ad8

Dylan-DPC-zz force-pushed the feature/stabilise-cfg-attr branch from 268204a to 13f8ad8 Compare January 7, 2019 18:53

Centril approved these changes Jan 8, 2019

View reviewed changes

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 Jan 8, 2019

bors added a commit that referenced this pull request Jan 8, 2019

Auto merge of #57332 - Dylan-DPC:feature/stabilise-cfg-attr, r=Centril

7ad470c

stabilize cfg_attr_multi Stabilizes cfg_attr_multi feature Related to #54881 Will add the lint in a seperate PR r? @Centril

bors merged commit 13f8ad8 into rust-lang:master Jan 8, 2019

bors mentioned this pull request Jan 8, 2019

Stabilize let bindings and destructuring in constants and const fn #57175

Merged

bors mentioned this pull request Jan 8, 2019

Stabilize extern_crate_self #57407

Merged

Dylan-DPC-zz deleted the feature/stabilise-cfg-attr branch January 8, 2019 17:11

This was referenced Jan 8, 2019

Document RFC 2539 (#[cfg_attr(p, attr1, attr2)]) rust-lang/reference#500

Closed

Tracking issue for RFC 2539, "#[cfg_attr] expanding to multiple attributes" #54881

Closed

Centril added the T-lang Relevant to the language team, which will review and decide on the PR/issue. label Jan 10, 2019

Centril added this to the 1.33 milestone Apr 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

stabilize cfg_attr_multi #57332

stabilize cfg_attr_multi #57332

Dylan-DPC-zz commented Jan 4, 2019

This comment has been minimized.

Centril commented Jan 4, 2019 •

edited

Loading

Dylan-DPC-zz commented Jan 5, 2019

This comment has been minimized.

This comment has been minimized.

Centril commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 8, 2019

rust-highfive commented Jan 8, 2019

Xanewok commented Jan 8, 2019

stabilize cfg_attr_multi #57332

stabilize cfg_attr_multi #57332

Conversation

Dylan-DPC-zz commented Jan 4, 2019

This comment has been minimized.

Centril commented Jan 4, 2019 • edited Loading

Dylan-DPC-zz commented Jan 5, 2019

This comment has been minimized.

This comment has been minimized.

Centril commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 8, 2019

bors commented Jan 8, 2019

rust-highfive commented Jan 8, 2019

Xanewok commented Jan 8, 2019

Centril commented Jan 4, 2019 •

edited

Loading