diff options
| author | bors <bors@rust-lang.org> | 2025-04-17 04:52:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-17 04:52:34 +0000 |
| commit | 15c4ccef03116e6a509199e845ad266306a0e9ee (patch) | |
| tree | dc68613f1c15f987b43a5a2bcbb91e1651c7aab3 /tests/ui/proc-macro | |
| parent | 79a272c6402e0ac0aed17c647c4f709479e67a30 (diff) | |
| parent | f8f22add3b874027e7e72c3d025b57e4c465ad33 (diff) | |
| download | rust-15c4ccef03116e6a509199e845ad266306a0e9ee.tar.gz rust-15c4ccef03116e6a509199e845ad266306a0e9ee.zip | |
Auto merge of #139940 - matthiaskrgr:rollup-rd4d3fn, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #135340 (Add `explicit_extern_abis` Feature and Enforce Explicit ABIs) - #139440 (rustc_target: RISC-V: feature addition batch 2) - #139667 (cfi: Remove #[no_sanitize(cfi)] for extern weak functions) - #139828 (Don't require rigid alias's trait to hold) - #139854 (Improve parse errors for stray lifetimes in type position) - #139889 (Clean UI tests 3 of n) - #139894 (Fix `opt-dist` CLI flag and make it work without LLD) - #139900 (stepping into impls for normalization is unproductive) - #139915 (replace some #[rustc_intrinsic] usage with use of the libcore declarations) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/proc-macro')
| -rw-r--r-- | tests/ui/proc-macro/inner-attrs.rs | 2 | ||||
| -rw-r--r-- | tests/ui/proc-macro/inner-attrs.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/proc-macro/inner-attrs.rs b/tests/ui/proc-macro/inner-attrs.rs index c541e93f904..ca4b2029a33 100644 --- a/tests/ui/proc-macro/inner-attrs.rs +++ b/tests/ui/proc-macro/inner-attrs.rs @@ -82,7 +82,7 @@ fn bar() { } -extern { //~ WARN extern declarations without an explicit ABI are deprecated +extern { //~ WARN `extern` declarations without an explicit ABI are deprecated fn weird_extern() { #![print_target_and_args_consume(tenth)] } diff --git a/tests/ui/proc-macro/inner-attrs.stderr b/tests/ui/proc-macro/inner-attrs.stderr index 4e7825c0d00..54cccae8da0 100644 --- a/tests/ui/proc-macro/inner-attrs.stderr +++ b/tests/ui/proc-macro/inner-attrs.stderr @@ -22,7 +22,7 @@ error: expected non-macro inner attribute, found attribute macro `print_attr` LL | #![print_attr] | ^^^^^^^^^^ not a non-macro inner attribute -warning: extern declarations without an explicit ABI are deprecated +warning: `extern` declarations without an explicit ABI are deprecated --> $DIR/inner-attrs.rs:85:1 | LL | extern { |