Deny braced macro invocations in let-else #119062

compiler-errors · 2023-12-18T02:13:33Z

Fixes #119057

Pending T-lang decision

cc @dtolnay

rustbot · 2023-12-18T02:13:41Z

r? @davidtwco

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

compiler/rustc_ast/src/util/classify.rs

tests/ui/parser/bad-let-else-statement.stderr

tmandry · 2023-12-20T16:49:43Z

We discussed this in the lang meeting and think this constitutes a bug fix, since the behavior diverges from the RFC and it wasn't mentioned in the stabilization report. There was no breakage found in an analysis on #119057 (comment).

@rfcbot merge

rfcbot · 2023-12-20T16:49:46Z

Team member @tmandry 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!

cc @rust-lang/lang-advisors: FCP proposed for lang, please feel free to register concerns.
See this document for info about what commands tagged team members can give me.

bors · 2023-12-26T05:20:56Z

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

davidtwco

Implementation looks good to me, r=me after t-lang sign-off.

nikomatsakis · 2024-01-04T22:36:25Z

@rfcbot reviewed

rfcbot · 2024-01-04T22:36:31Z

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

rfcbot · 2024-01-14T22:41:32Z

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.

This will be merged soon.

compiler-errors · 2024-01-16T16:53:40Z

@bors r=davidtwco,est31

bors · 2024-01-16T16:53:43Z

📌 Commit fd02369 has been approved by davidtwco,est31

It is now in the queue for this repository.

…=davidtwco,est31 Deny braced macro invocations in let-else Fixes rust-lang#119057 Pending T-lang decision cc `@dtolnay`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#119062 (Deny braced macro invocations in let-else) - rust-lang#119922 (Rework how diagnostic lints are stored.) - rust-lang#119978 (Move async closure parameters into the resultant closure's future eagerly) - rust-lang#119984 (Change return type of unstable `Waker::noop()` from `Waker` to `&Waker`.) - rust-lang#120020 (Gracefully handle missing typeck information if typeck errored) - rust-lang#120021 (don't store const var origins for known vars) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-01-16T22:04:01Z

@bors r-
failed in #120030 (comment) I think

compiler-errors · 2024-01-18T00:02:14Z

I changed this to use format_args rather than asm so it's not platform-dependent.

@bors r=davidtwco

bors · 2024-01-18T00:02:17Z

📌 Commit ec263df has been approved by davidtwco

It is now in the queue for this repository.

compiler-errors · 2024-01-18T00:02:24Z

@bors r=davidtwco,est31

bors · 2024-01-18T00:02:26Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Rollup of 10 pull requests #120068

bors · 2024-01-18T00:02:27Z

📌 Commit ec263df has been approved by davidtwco,est31

It is now in the queue for this repository.

compiler-errors · 2024-01-19T00:09:26Z

@bors rollup=always

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#118665 (Consolidate all associated items on the NonZero integer types into a single impl block per type) - rust-lang#118798 (Use AtomicU8 instead of AtomicUsize in backtrace.rs) - rust-lang#119062 (Deny braced macro invocations in let-else) - rust-lang#119138 (Docs: Use non-SeqCst in module example of atomics) - rust-lang#119907 (Update `fn()` trait implementation docs) - rust-lang#120083 (Warn when not having a profiler runtime means that coverage tests won't be run/blessed) - rust-lang#120107 (dead_code treats #[repr(transparent)] the same as #[repr(C)]) - rust-lang#120110 (Update documentation for Vec::into_boxed_slice to be more clear about excess capacity) - rust-lang#120113 (Remove myself from review rotation) - rust-lang#120118 (Fix typo in documentation in base.rs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119062 - compiler-errors:asm-in-let-else, r=davidtwco,est31 Deny braced macro invocations in let-else Fixes rust-lang#119057 Pending T-lang decision cc `@dtolnay`

Pkgsrc changes: * Adapt checksums and patches. Upstream chnages: Version 1.77.0 (2024-03-21) ========================== - [Reveal opaque types within the defining body for exhaustiveness checking.] (rust-lang/rust#116821) - [Stabilize C-string literals.] (rust-lang/rust#117472) - [Stabilize THIR unsafeck.] (rust-lang/rust#117673) - [Add lint `static_mut_refs` to warn on references to mutable statics.] (rust-lang/rust#117556) - [Support async recursive calls (as long as they have indirection).] (rust-lang/rust#117703) - [Undeprecate lint `unstable_features` and make use of it in the compiler.] (rust-lang/rust#118639) - [Make inductive cycles in coherence ambiguous always.] (rust-lang/rust#118649) - [Get rid of type-driven traversal in const-eval interning] (rust-lang/rust#119044), only as a [future compatiblity lint] (rust-lang/rust#122204) for now. - [Deny braced macro invocations in let-else.] (rust-lang/rust#119062) Compiler -------- - [Include lint `soft_unstable` in future breakage reports.] (rust-lang/rust#116274) - [Make `i128` and `u128` 16-byte aligned on x86-based targets.] (rust-lang/rust#116672) - [Use `--verbose` in diagnostic output.] (rust-lang/rust#119129) - [Improve spacing between printed tokens.] (rust-lang/rust#120227) - [Merge the `unused_tuple_struct_fields` lint into `dead_code`.] (rust-lang/rust#118297) - [Error on incorrect implied bounds in well-formedness check] (rust-lang/rust#118553), with a temporary exception for Bevy. - [Fix coverage instrumentation/reports for non-ASCII source code.] (rust-lang/rust#119033) - [Fix `fn`/`const` items implied bounds and well-formedness check.] (rust-lang/rust#120019) - [Promote `riscv32{im|imafc}-unknown-none-elf` targets to tier 2.] (rust-lang/rust#118704) - Add several new tier 3 targets: - [`aarch64-unknown-illumos`] (rust-lang/rust#112936) - [`hexagon-unknown-none-elf`] (rust-lang/rust#117601) - [`riscv32imafc-esp-espidf`] (rust-lang/rust#119738) - [`riscv32im-risc0-zkvm-elf`] (rust-lang/rust#117958) Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Implement `From<&[T; N]>` for `Cow<[T]>`.] (rust-lang/rust#113489) - [Remove special-case handling of `vec.split_off (0)`.](rust-lang/rust#119917) Stabilized APIs --------------- - [`array::each_ref`] (https://doc.rust-lang.org/stable/std/primitive.array.html#method.each_ref) - [`array::each_mut`] (https://doc.rust-lang.org/stable/std/primitive.array.html#method.each_mut) - [`core::net`] (https://doc.rust-lang.org/stable/core/net/index.html) - [`f32::round_ties_even`] (https://doc.rust-lang.org/stable/std/primitive.f32.html#method.round_ties_even) - [`f64::round_ties_even`] (https://doc.rust-lang.org/stable/std/primitive.f64.html#method.round_ties_even) - [`mem::offset_of!`] (https://doc.rust-lang.org/stable/std/mem/macro.offset_of.html) - [`slice::first_chunk`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.first_chunk) - [`slice::first_chunk_mut`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.first_chunk_mut) - [`slice::split_first_chunk`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.split_first_chunk) - [`slice::split_first_chunk_mut`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.split_first_chunk_mut) - [`slice::last_chunk`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.last_chunk) - [`slice::last_chunk_mut`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.last_chunk_mut) - [`slice::split_last_chunk`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.split_last_chunk) - [`slice::split_last_chunk_mut`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.split_last_chunk_mut) - [`slice::chunk_by`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.chunk_by) - [`slice::chunk_by_mut`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#method.chunk_by_mut) - [`Bound::map`] (https://doc.rust-lang.org/stable/std/ops/enum.Bound.html#method.map) - [`File::create_new`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.create_new) - [`Mutex::clear_poison`] (https://doc.rust-lang.org/stable/std/sync/struct.Mutex.html#method.clear_poison) - [`RwLock::clear_poison`] (https://doc.rust-lang.org/stable/std/sync/struct.RwLock.html#method.clear_poison) Cargo ----- - [Extend the build directive syntax with `cargo::`.] (rust-lang/cargo#12201) - [Stabilize metadata `id` format as `PackageIDSpec`.] (rust-lang/cargo#12914) - [Pull out as `cargo-util-schemas` as a crate.] (rust-lang/cargo#13178) - [Strip all debuginfo when debuginfo is not requested.] (rust-lang/cargo#13257) - [Inherit jobserver from env for all kinds of runners.] (rust-lang/cargo#12776) - [Deprecate rustc plugin support in cargo.] (rust-lang/cargo#13248) Rustdoc ----- - [Allows links in markdown headings.] (rust-lang/rust#117662) - [Search for tuples and unit by type with `()`.] (rust-lang/rust#118194) - [Clean up the source sidebar's hide button.] (rust-lang/rust#119066) - [Prevent JS injection from `localStorage`.] (rust-lang/rust#120250) Misc ---- - [Recommend version-sorting for all sorting in style guide.] (rust-lang/rust#115046) Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. - [Add more weirdness to `weird-exprs.rs`.] (rust-lang/rust#119028)

rustbot assigned davidtwco Dec 18, 2023

compiler-errors added T-lang Relevant to the language team, which will review and decide on the PR/issue. S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Dec 18, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 18, 2023

compiler-errors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 18, 2023

compiler-errors commented Dec 18, 2023

View reviewed changes

compiler/rustc_ast/src/util/classify.rs Show resolved Hide resolved

compiler-errors removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 18, 2023

est31 reviewed Dec 18, 2023

View reviewed changes

tests/ui/parser/bad-let-else-statement.stderr Outdated Show resolved Hide resolved

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 Dec 20, 2023

traviscross mentioned this pull request Dec 21, 2023

Consider disallowing let-else expression from ending in }, as the RFC said #119057

Closed

davidtwco approved these changes Jan 3, 2024

View reviewed changes

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Jan 4, 2024

est31 approved these changes Jan 15, 2024

View reviewed changes

est31 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-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Jan 15, 2024

rust-cloud-vms bot force-pushed the asm-in-let-else branch from af05d2a to fd02369 Compare January 16, 2024 15:22

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 16, 2024

matthiaskrgr mentioned this pull request Jan 16, 2024

Rollup of 6 pull requests #120030

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 16, 2024

compiler-errors added 2 commits January 17, 2024 23:59

Deny braced macro invocations in let-else

c1c7707

Suggest wrapping mac args in parens rather than the whole expression

ec263df

rust-cloud-vms bot force-pushed the asm-in-let-else branch from fd02369 to ec263df Compare January 18, 2024 00:01

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 18, 2024

matthiaskrgr mentioned this pull request Jan 19, 2024

Rollup of 10 pull requests #120121

Merged

bors merged commit 2e4c6fc into rust-lang:master Jan 19, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 19, 2024

apiraino removed the to-announce Announce this issue on triage meeting label Jan 25, 2024

ehuss mentioned this pull request Feb 25, 2024

regression: let-else syntax restriction (right curly brace not allowed) #121608

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deny braced macro invocations in let-else #119062

Deny braced macro invocations in let-else #119062

compiler-errors commented Dec 18, 2023

rustbot commented Dec 18, 2023

tmandry commented Dec 20, 2023

rfcbot commented Dec 20, 2023 •

edited by joshtriplett

bors commented Dec 26, 2023

davidtwco left a comment

nikomatsakis commented Jan 4, 2024

rfcbot commented Jan 4, 2024

rfcbot commented Jan 14, 2024

compiler-errors commented Jan 16, 2024

bors commented Jan 16, 2024

matthiaskrgr commented Jan 16, 2024

compiler-errors commented Jan 18, 2024

bors commented Jan 18, 2024

compiler-errors commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

compiler-errors commented Jan 19, 2024

Deny braced macro invocations in let-else #119062

Deny braced macro invocations in let-else #119062

Conversation

compiler-errors commented Dec 18, 2023

rustbot commented Dec 18, 2023

tmandry commented Dec 20, 2023

rfcbot commented Dec 20, 2023 • edited by joshtriplett

bors commented Dec 26, 2023

davidtwco left a comment

Choose a reason for hiding this comment

nikomatsakis commented Jan 4, 2024

rfcbot commented Jan 4, 2024

rfcbot commented Jan 14, 2024

compiler-errors commented Jan 16, 2024

bors commented Jan 16, 2024

matthiaskrgr commented Jan 16, 2024

compiler-errors commented Jan 18, 2024

bors commented Jan 18, 2024

compiler-errors commented Jan 18, 2024

bors commented Jan 18, 2024

bors commented Jan 18, 2024

compiler-errors commented Jan 19, 2024

rfcbot commented Dec 20, 2023 •

edited by joshtriplett