about summary refs log tree commit diff
path: root/tests/ui/attributes/unsafe/double-unsafe-attributes.stderr
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-10-02 11:14:37 +0000
committerbors <bors@rust-lang.org>2025-10-02 11:14:37 +0000
commit94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3 (patch)
treeb3836c3f29d9f4ce549e329a6234adc437c1d5aa /tests/ui/attributes/unsafe/double-unsafe-attributes.stderr
parent4b9c62b4da3e17cee99d3d2052f1c576b188e2a8 (diff)
parent2d1efe76bcf0871a580476841141441742198310 (diff)
downloadrust-94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3.tar.gz
rust-94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3.zip
Auto merge of #147261 - matthiaskrgr:rollup-yh3fgvc, r=matthiaskrgr
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#146281 (Support `#[rustc_align_static]` inside `thread_local!`)
 - rust-lang/rust#146535 (mbe: Implement `unsafe` attribute rules)
 - rust-lang/rust#146585 (indexing: reword help)
 - rust-lang/rust#147004 (Tweak handling of "struct like start" where a struct isn't supported)
 - rust-lang/rust#147221 (Forbid `//@ compile-flags: -Cincremental=` in tests)
 - rust-lang/rust#147225 (Don't enable shared memory by default with Wasm atomics)
 - rust-lang/rust#147227 (implement `Box::take`)
 - rust-lang/rust#147233 (Initialize llvm submodule if not already the case to run citool)
 - rust-lang/rust#147236 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/attributes/unsafe/double-unsafe-attributes.stderr')
-rw-r--r--tests/ui/attributes/unsafe/double-unsafe-attributes.stderr6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/ui/attributes/unsafe/double-unsafe-attributes.stderr b/tests/ui/attributes/unsafe/double-unsafe-attributes.stderr
index 0825cf79408..846800daa54 100644
--- a/tests/ui/attributes/unsafe/double-unsafe-attributes.stderr
+++ b/tests/ui/attributes/unsafe/double-unsafe-attributes.stderr
@@ -9,13 +9,11 @@ help: escape `unsafe` to use it as an identifier
 LL | #[unsafe(r#unsafe(no_mangle))]
    |          ++
 
-error: `r#unsafe` is not an unsafe attribute
+error: unnecessary `unsafe` on safe attribute
   --> $DIR/double-unsafe-attributes.rs:1:3
    |
 LL | #[unsafe(unsafe(no_mangle))]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
+   |   ^^^^^^
 
 error: cannot find attribute `r#unsafe` in this scope
   --> $DIR/double-unsafe-attributes.rs:1:10