user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #90836 - matthiaskrgr:rollup-ou6yrlw, r=matthiaskrgr

Browse source 
Rollup of 7 pull requests

Successful merges:

 - #90589 (rustc_llvm: update PassWrapper for recent LLVM)
 - #90644 (Extend the const swap feature)
 - #90704 (Unix ExitStatus comments and a tiny docs fix)
 - #90761 (Shorten Span of unused macro lints)
 - #90795 (Add more comments to explain the code to generate the search index)
 - #90798 (Document `unreachable!` custom panic message)
 - #90826 (rustc_feature: Convert `BuiltinAttribute` from tuple to a struct)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2021-11-12 19:28:04 +00:00
commit e90c5fbbc5
21 changed files with 145 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/test/ui/lint/unused/issue-70041.stderr
View file

@ -1,11 +1,8 @@
warning: unused macro definition
--> $DIR/issue-70041.rs:4:1
warning: unused macro definition: `regex`
--> $DIR/issue-70041.rs:4:14
|
LL | / macro_rules! regex {
LL | |
LL | | () => {};
LL | | }
| |_^
LL | macro_rules! regex {
| ^^^^^
|
= note: `#[warn(unused_macros)]` on by default

35
src/test/ui/lint/unused/unused-macro-rules.stderr
View file

@ -1,10 +1,8 @@
error: unused macro definition
--> $DIR/unused-macro-rules.rs:4:1
error: unused macro definition: `unused`
--> $DIR/unused-macro-rules.rs:4:14
|
LL | / macro_rules! unused {
LL | | () => {};
LL | | }
| |_^
LL | macro_rules! unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro-rules.rs:1:9
@ -12,26 +10,17 @@ note: the lint level is defined here
LL | #![deny(unused_macros)]
| ^^^^^^^^^^^^^
error: unused macro definition
--> $DIR/unused-macro-rules.rs:11:9
error: unused macro definition: `m`
--> $DIR/unused-macro-rules.rs:11:22
|
LL | / macro_rules! m {
LL | | () => {};
LL | | }
| |_________^
...
LL | create_macro!();
| --------------- in this macro invocation
|
= note: this error originates in the macro `create_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
LL | macro_rules! m {
| ^
error: unused macro definition
--> $DIR/unused-macro-rules.rs:24:5
error: unused macro definition: `unused`
--> $DIR/unused-macro-rules.rs:24:18
|
LL | / macro_rules! unused {
LL | | () => {};
LL | | }
| |_____^
LL | macro_rules! unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro-rules.rs:23:12

30
src/test/ui/lint/unused/unused-macro.stderr
View file

@ -1,10 +1,8 @@
error: unused macro definition
--> $DIR/unused-macro.rs:5:1
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:5:7
|
LL | / macro unused {
LL | | () => {}
LL | | }
| |_^
LL | macro unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro.rs:2:9
@ -12,13 +10,11 @@ note: the lint level is defined here
LL | #![deny(unused_macros)]
| ^^^^^^^^^^^^^
error: unused macro definition
--> $DIR/unused-macro.rs:15:5
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:15:11
|
LL | / macro unused {
LL | | () => {}
LL | | }
| |_____^
LL | macro unused {
| ^^^^^^
|
note: the lint level is defined here
--> $DIR/unused-macro.rs:14:12
@ -26,13 +22,11 @@ note: the lint level is defined here
LL | #[deny(unused_macros)]
| ^^^^^^^^^^^^^
error: unused macro definition
--> $DIR/unused-macro.rs:21:5
error: unused macro definition: `unused`
--> $DIR/unused-macro.rs:21:22
|
LL | / pub(crate) macro unused {
LL | | () => {}
LL | | }
| |_____^
LL | pub(crate) macro unused {
| ^^^^^^
error: aborting due to 3 previous errors

2
src/test/ui/proc-macro/issue-39889.rs
View file

@ -1,6 +1,6 @@
// run-pass
#![allow(dead_code)]
#![allow(dead_code, unused_macros)]
// aux-build:issue-39889.rs
extern crate issue_39889;