Skip to content

Check if merged attributes list is empty in expr #139391

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

Merged
merged 1 commit into from
Apr 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions compiler/rustc_ast_lowering/src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ impl<'hir> LoweringContext<'_, 'hir> {
// Merge attributes into the inner expression.
if !e.attrs.is_empty() {
let old_attrs = self.attrs.get(&ex.hir_id.local_id).copied().unwrap_or(&[]);
self.attrs.insert(
ex.hir_id.local_id,
&*self.arena.alloc_from_iter(
self.lower_attrs_vec(&e.attrs, e.span)
.into_iter()
.chain(old_attrs.iter().cloned()),
),
let attrs = &*self.arena.alloc_from_iter(
self.lower_attrs_vec(&e.attrs, e.span)
.into_iter()
.chain(old_attrs.iter().cloned()),
);
if attrs.is_empty() {
return ex;
}

self.attrs.insert(ex.hir_id.local_id, attrs);
}
return ex;
}
Expand Down
6 changes: 6 additions & 0 deletions tests/ui/attributes/invalid-reprs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fn main() {
let y = #[repr(uwu(4))]
//~^ ERROR attributes on expressions are experimental
//~| ERROR unrecognized representation hint
(&id(5)); //~ ERROR: cannot find function `id` in this scope
}
33 changes: 33 additions & 0 deletions tests/ui/attributes/invalid-reprs.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
error[E0658]: attributes on expressions are experimental
--> $DIR/invalid-reprs.rs:2:13
|
LL | let y = #[repr(uwu(4))]
| ^^^^^^^^^^^^^^^
|
= note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
= help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

error[E0425]: cannot find function `id` in this scope
--> $DIR/invalid-reprs.rs:5:7
|
LL | (&id(5));
| ^^ not found in this scope
|
help: consider importing this function
|
LL + use std::process::id;
|

error[E0552]: unrecognized representation hint
--> $DIR/invalid-reprs.rs:2:20
|
LL | let y = #[repr(uwu(4))]
| ^^^^^^
|
= help: valid reprs are `Rust` (default), `C`, `align`, `packed`, `transparent`, `simd`, `i8`, `u8`, `i16`, `u16`, `i32`, `u32`, `i64`, `u64`, `i128`, `u128`, `isize`, `usize`

error: aborting due to 3 previous errors

Some errors have detailed explanations: E0425, E0552, E0658.
For more information about an error, try `rustc --explain E0425`.
Loading