diff options
| author | Oli Scherer <github35764891676564198441@oli-obk.de> | 2025-07-22 07:31:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-22 07:31:34 +0000 |
| commit | 7a8288bce479b12f489a2b66b5cee1dfc6ff2e07 (patch) | |
| tree | 1e3358af6a7e888bc61e10260096da0fad04ade5 /compiler/rustc_parse/src | |
| parent | 800d80593e807371a7a149655b1625c70e3a9416 (diff) | |
| parent | 4d62686f4f3d5249e96c0ae82217abae052fe481 (diff) | |
| download | rust-7a8288bce479b12f489a2b66b5cee1dfc6ff2e07.tar.gz rust-7a8288bce479b12f489a2b66b5cee1dfc6ff2e07.zip | |
Merge pull request #4487 from rust-lang/rustup-2025-07-22
Automatic Rustup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/validate_attr.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs index a476f0db37e..cca621103b5 100644 --- a/compiler/rustc_parse/src/validate_attr.rs +++ b/compiler/rustc_parse/src/validate_attr.rs @@ -294,7 +294,9 @@ pub fn check_builtin_meta_item( | sym::rustc_paren_sugar | sym::type_const | sym::repr - | sym::align + // FIXME(#82232, #143834): temporarily renamed to mitigate `#[align]` nameres + // ambiguity + | sym::rustc_align | sym::deprecated | sym::optimize | sym::pointee |