diff options
| author | bors <bors@rust-lang.org> | 2025-06-20 23:09:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-20 23:09:48 +0000 |
| commit | 15c701fbc995eb6c5b3a86021c18185f8eee020d (patch) | |
| tree | 0d4b164e407ebce78c37e09f104e5371e9aa149c /compiler/rustc_parse/src/validate_attr.rs | |
| parent | 5526a2f47cd676ceeedc08cf71ae75ce2e9284ae (diff) | |
| parent | 61f491872a01b0906fcedc3862d0e11cb3f6de01 (diff) | |
| download | rust-15c701fbc995eb6c5b3a86021c18185f8eee020d.tar.gz rust-15c701fbc995eb6c5b3a86021c18185f8eee020d.zip | |
Auto merge of #142794 - tgross35:rollup-iae7okj, r=tgross35
Rollup of 9 pull requests Successful merges: - rust-lang/rust#142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.) - rust-lang/rust#142491 (Rework #[cold] attribute parser) - rust-lang/rust#142494 (Fix missing docs in `rustc_attr_parsing`) - rust-lang/rust#142495 (Better template for `#[repr]` attributes) - rust-lang/rust#142497 (Fix random failure when JS code is executed when the whole file was not read yet) - rust-lang/rust#142575 (Ensure copy* intrinsics also perform the static self-init checks) - rust-lang/rust#142650 (Refactor Translator) - rust-lang/rust#142713 (mbe: Refactor transcription) - rust-lang/rust#142755 (rustdoc: Remove `FormatRenderer::cache`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/validate_attr.rs')
| -rw-r--r-- | compiler/rustc_parse/src/validate_attr.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs index 646e996ff30..ed1737bee33 100644 --- a/compiler/rustc_parse/src/validate_attr.rs +++ b/compiler/rustc_parse/src/validate_attr.rs @@ -292,6 +292,7 @@ fn emit_malformed_attribute( | sym::align | sym::deprecated | sym::optimize + | sym::cold ) { return; } |