Skip to content

Commit 6058f37

Browse files
committed
Auto merge of #118001 - TaKO8Ki:rollup-fedlwwj, r=TaKO8Ki
Rollup of 5 pull requests Successful merges: - #117649 (Move `lint_store`) - #117850 (bootstrap: simplify setting unstable-options for tools) - #117889 (docs(release): Clarify cargo entries) - #117946 (avoid exhaustive i16 test in Miri) - #117963 (`rustc_query_system` cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1493a29 + 00f30b9 commit 6058f37

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/ui/macro_use_imports.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: `macro_use` attributes are no longer needed in the Rust 2018 edition
2-
--> $DIR/macro_use_imports.rs:25:5
2+
--> $DIR/macro_use_imports.rs:23:5
33
|
44
LL | #[macro_use]
5-
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::inner::nested::string_add;`
5+
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::{inner::mut_mut, inner::try_err};`
66
|
77
= note: `-D clippy::macro-use-imports` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::macro_use_imports)]`
99

1010
error: `macro_use` attributes are no longer needed in the Rust 2018 edition
11-
--> $DIR/macro_use_imports.rs:23:5
11+
--> $DIR/macro_use_imports.rs:21:5
1212
|
1313
LL | #[macro_use]
14-
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::{inner::mut_mut, inner::try_err};`
14+
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mini_mac::ClippyMiniMacroTest;`
1515

1616
error: `macro_use` attributes are no longer needed in the Rust 2018 edition
17-
--> $DIR/macro_use_imports.rs:21:5
17+
--> $DIR/macro_use_imports.rs:25:5
1818
|
1919
LL | #[macro_use]
20-
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mini_mac::ClippyMiniMacroTest;`
20+
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::inner::nested::string_add;`
2121

2222
error: `macro_use` attributes are no longer needed in the Rust 2018 edition
2323
--> $DIR/macro_use_imports.rs:19:5

0 commit comments

Comments
 (0)