diff options
Diffstat (limited to 'tests/ui/imports')
65 files changed, 150 insertions, 63 deletions
diff --git a/tests/ui/imports/ambiguous-11.stderr b/tests/ui/imports/ambiguous-11.stderr index 765d6afa8..5b7f3059e 100644 --- a/tests/ui/imports/ambiguous-11.stderr +++ b/tests/ui/imports/ambiguous-11.stderr @@ -18,6 +18,6 @@ LL | use ambiguous_11_extern::*; | ^^^^^^^^^^^^^^^^^^^^^^ = help: consider adding an explicit import of `Error` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/ambiguous-7.stderr b/tests/ui/imports/ambiguous-7.stderr index 2c6b56c61..addc28ff5 100644 --- a/tests/ui/imports/ambiguous-7.stderr +++ b/tests/ui/imports/ambiguous-7.stderr @@ -18,6 +18,6 @@ LL | pub use t2::*; | ^^^^^ = help: consider adding an explicit import of `Error` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/ambiguous-8.stderr b/tests/ui/imports/ambiguous-8.stderr index 32056fba6..11914efe9 100644 --- a/tests/ui/imports/ambiguous-8.stderr +++ b/tests/ui/imports/ambiguous-8.stderr @@ -18,6 +18,6 @@ LL | use ambiguous_8_extern::*; | ^^^^^^^^^^^^^^^^^^^^^ = help: consider adding an explicit import of `Error` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/double-import.stderr b/tests/ui/imports/double-import.stderr index 82f5eb83e..73bb73e34 100644 --- a/tests/ui/imports/double-import.stderr +++ b/tests/ui/imports/double-import.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use sub2::foo as other_foo; | ~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/extern-crate-used.stderr b/tests/ui/imports/extern-crate-used.stderr index 1b9a2e472..982da0c91 100644 --- a/tests/ui/imports/extern-crate-used.stderr +++ b/tests/ui/imports/extern-crate-used.stderr @@ -10,5 +10,5 @@ note: the lint level is defined here LL | #![deny(unused_extern_crates)] | ^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/extern-with-ambiguous-1.stderr b/tests/ui/imports/extern-with-ambiguous-1.stderr index dca2b4ebe..ab4aeacbd 100644 --- a/tests/ui/imports/extern-with-ambiguous-1.stderr +++ b/tests/ui/imports/extern-with-ambiguous-1.stderr @@ -18,6 +18,6 @@ LL | use extern_with_ambiguous_1_extern::*; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = help: consider adding an explicit import of `error` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/import-crate-var.stderr b/tests/ui/imports/import-crate-var.stderr index f1f1dfbdb..41a8772d2 100644 --- a/tests/ui/imports/import-crate-var.stderr +++ b/tests/ui/imports/import-crate-var.stderr @@ -6,5 +6,5 @@ LL | m!(); | = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/import-from-missing.stderr b/tests/ui/imports/import-from-missing.stderr index 4254bfb5e..4020ec1b5 100644 --- a/tests/ui/imports/import-from-missing.stderr +++ b/tests/ui/imports/import-from-missing.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `spam::eggs` LL | use spam::{ham, eggs}; | ^^^^ no `eggs` in `spam` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/import-glob-0.stderr b/tests/ui/imports/import-glob-0.stderr index 820ff1bb5..6a2837e77 100644 --- a/tests/ui/imports/import-glob-0.stderr +++ b/tests/ui/imports/import-glob-0.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find function `f999` in this scope LL | f999(); | ^^^^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/imports/import-glob-circular.stderr b/tests/ui/imports/import-glob-circular.stderr index 86bbea579..2eb268813 100644 --- a/tests/ui/imports/import-glob-circular.stderr +++ b/tests/ui/imports/import-glob-circular.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find function `f1066` in this scope LL | fn test() { f1066(); } | ^^^^^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/imports/import-loop-2.stderr b/tests/ui/imports/import-loop-2.stderr index 1abfcde03..1a95200a6 100644 --- a/tests/ui/imports/import-loop-2.stderr +++ b/tests/ui/imports/import-loop-2.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `a::x` LL | pub use a::x; | ^^^^ no `x` in `a` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/import-loop.stderr b/tests/ui/imports/import-loop.stderr index b87bfb1be..8ad2d6be4 100644 --- a/tests/ui/imports/import-loop.stderr +++ b/tests/ui/imports/import-loop.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `y::x` LL | pub use y::x; | ^^^^ no `x` in `y` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/import-prefix-macro-1.stderr b/tests/ui/imports/import-prefix-macro-1.stderr index a6a5b1393..bdc0e85b4 100644 --- a/tests/ui/imports/import-prefix-macro-1.stderr +++ b/tests/ui/imports/import-prefix-macro-1.stderr @@ -9,5 +9,5 @@ LL | import! { a::b::c } | = note: this error originates in the macro `import` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/import-prefix-macro-2.stderr b/tests/ui/imports/import-prefix-macro-2.stderr index 23f8d5764..070186f2b 100644 --- a/tests/ui/imports/import-prefix-macro-2.stderr +++ b/tests/ui/imports/import-prefix-macro-2.stderr @@ -9,5 +9,5 @@ LL | import! { a::b::c } | = note: this error originates in the macro `import` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/import-trait-method.stderr b/tests/ui/imports/import-trait-method.stderr index 3c26907d3..9786eb52d 100644 --- a/tests/ui/imports/import-trait-method.stderr +++ b/tests/ui/imports/import-trait-method.stderr @@ -4,6 +4,6 @@ error[E0253]: `foo` is not directly importable LL | use Foo::foo; | ^^^^^^^^ cannot be imported directly -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0253`. diff --git a/tests/ui/imports/import2.stderr b/tests/ui/imports/import2.stderr index da888979c..55eea66fd 100644 --- a/tests/ui/imports/import2.stderr +++ b/tests/ui/imports/import2.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `baz::zed` LL | use baz::zed::bar; | ^^^ could not find `zed` in `baz` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/import3.stderr b/tests/ui/imports/import3.stderr index ca75c9c18..80b0a7f06 100644 --- a/tests/ui/imports/import3.stderr +++ b/tests/ui/imports/import3.stderr @@ -6,6 +6,6 @@ LL | use main::bar; | = help: consider adding `extern crate main` to use the `main` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/import4.stderr b/tests/ui/imports/import4.stderr index e0b478f1a..c99e83851 100644 --- a/tests/ui/imports/import4.stderr +++ b/tests/ui/imports/import4.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `a::foo` LL | mod b { pub use a::foo; } | ^^^^^^ no `foo` in `a` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-109148.stderr b/tests/ui/imports/issue-109148.stderr index 6cc1221cf..b7f1f69dc 100644 --- a/tests/ui/imports/issue-109148.stderr +++ b/tests/ui/imports/issue-109148.stderr @@ -9,5 +9,5 @@ LL | m!(); | = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/issue-109343.stderr b/tests/ui/imports/issue-109343.stderr index 8d9a3aee9..1b95fcf55 100644 --- a/tests/ui/imports/issue-109343.stderr +++ b/tests/ui/imports/issue-109343.stderr @@ -6,6 +6,6 @@ LL | pub use unresolved::f; | = help: consider adding `extern crate unresolved` to use the `unresolved` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-113953.stderr b/tests/ui/imports/issue-113953.stderr index 70f91bd3c..9daa73a9f 100644 --- a/tests/ui/imports/issue-113953.stderr +++ b/tests/ui/imports/issue-113953.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `unresolved` LL | use unresolved as u8; | ^^^^^^^^^^^^^^^^ no external crate `unresolved` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-13404.stderr b/tests/ui/imports/issue-13404.stderr index 1f50debb0..a77f399e7 100644 --- a/tests/ui/imports/issue-13404.stderr +++ b/tests/ui/imports/issue-13404.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `b::f` LL | use b::f; | ^^^^ no `f` in `b` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-1697.stderr b/tests/ui/imports/issue-1697.stderr index 019ef9ad5..840608ca2 100644 --- a/tests/ui/imports/issue-1697.stderr +++ b/tests/ui/imports/issue-1697.stderr @@ -6,6 +6,6 @@ LL | use unresolved::*; | = help: consider adding `extern crate unresolved` to use the `unresolved` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-28388-1.stderr b/tests/ui/imports/issue-28388-1.stderr index 7f5e47aa8..8256f96c6 100644 --- a/tests/ui/imports/issue-28388-1.stderr +++ b/tests/ui/imports/issue-28388-1.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `foo` LL | use foo::{}; | ^^^^^^^ no `foo` in the root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-28388-2.stderr b/tests/ui/imports/issue-28388-2.stderr index 1afaf622b..4eda57dd9 100644 --- a/tests/ui/imports/issue-28388-2.stderr +++ b/tests/ui/imports/issue-28388-2.stderr @@ -10,6 +10,6 @@ note: the module `n` is defined here LL | mod n {} | ^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0603`. diff --git a/tests/ui/imports/issue-2937.stderr b/tests/ui/imports/issue-2937.stderr index 428634828..15622f233 100644 --- a/tests/ui/imports/issue-2937.stderr +++ b/tests/ui/imports/issue-2937.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `m::f` LL | use m::f as x; | ^^^^^^^^^ no `f` in `m` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-32354-suggest-import-rename.stderr b/tests/ui/imports/issue-32354-suggest-import-rename.stderr index 4c5875ba7..de9bdc4f2 100644 --- a/tests/ui/imports/issue-32354-suggest-import-rename.stderr +++ b/tests/ui/imports/issue-32354-suggest-import-rename.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use extension2::ConstructorExtension as OtherConstructorExtension; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-32833.stderr b/tests/ui/imports/issue-32833.stderr index 430cc0fda..332561eca 100644 --- a/tests/ui/imports/issue-32833.stderr +++ b/tests/ui/imports/issue-32833.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `bar::Foo` LL | use bar::Foo; | ^^^^^^^^ no `Foo` in `bar` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-36881.stderr b/tests/ui/imports/issue-36881.stderr index 2e1b46860..e9b632d27 100644 --- a/tests/ui/imports/issue-36881.stderr +++ b/tests/ui/imports/issue-36881.stderr @@ -6,6 +6,6 @@ LL | use issue_36881_aux::Foo; | = help: consider adding `extern crate issue_36881_aux` to use the `issue_36881_aux` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-4366.stderr b/tests/ui/imports/issue-4366.stderr index 4d5b392a7..e63399d55 100644 --- a/tests/ui/imports/issue-4366.stderr +++ b/tests/ui/imports/issue-4366.stderr @@ -9,6 +9,6 @@ help: consider importing this function LL + use foo::foo; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr index 25aca4cb7..80cea1a83 100644 --- a/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr +++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr @@ -10,6 +10,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate std as other_std; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0259`. diff --git a/tests/ui/imports/issue-45829/import-twice.stderr b/tests/ui/imports/issue-45829/import-twice.stderr index 656b011bc..b19d5d8f7 100644 --- a/tests/ui/imports/issue-45829/import-twice.stderr +++ b/tests/ui/imports/issue-45829/import-twice.stderr @@ -8,6 +8,6 @@ LL | use foo::{A, A}; | = note: `A` must be defined only once in the type namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-45829/issue-45829.stderr b/tests/ui/imports/issue-45829/issue-45829.stderr index e9a9d47ce..627a09a07 100644 --- a/tests/ui/imports/issue-45829/issue-45829.stderr +++ b/tests/ui/imports/issue-45829/issue-45829.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use foo::{A, B as OtherA}; | ~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr index 98fd8a623..8f2f7bbac 100644 --- a/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr +++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate issue_45829_b as other_bar; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0254`. diff --git a/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr index 2c4e8ce99..ae26d1fd0 100644 --- a/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr +++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate issue_45829_b as other_issue_45829_a; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0259`. diff --git a/tests/ui/imports/issue-45829/rename-extern.stderr b/tests/ui/imports/issue-45829/rename-extern.stderr index 209ae2201..46560ef92 100644 --- a/tests/ui/imports/issue-45829/rename-extern.stderr +++ b/tests/ui/imports/issue-45829/rename-extern.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate issue_45829_b as other_issue_45829_a; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0259`. diff --git a/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr index dfb5810c4..9b0a2534a 100644 --- a/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr +++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use std as other_issue_45829_b; | ~~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0254`. diff --git a/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr index 5a63af588..5751f41ae 100644 --- a/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr +++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use foo::{A, bar::B as OtherA}; | ~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-45829/rename-with-path.stderr b/tests/ui/imports/issue-45829/rename-with-path.stderr index 2d26b0838..69e084db6 100644 --- a/tests/ui/imports/issue-45829/rename-with-path.stderr +++ b/tests/ui/imports/issue-45829/rename-with-path.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use std::{collections::HashMap as A, sync::Arc as OtherA}; | ~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-45829/rename.stderr b/tests/ui/imports/issue-45829/rename.stderr index ed185ae2a..f1ee5112d 100644 --- a/tests/ui/imports/issue-45829/rename.stderr +++ b/tests/ui/imports/issue-45829/rename.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use std as other_core; | ~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/imports/issue-47623.stderr b/tests/ui/imports/issue-47623.stderr index 53968a296..be42a4a5b 100644 --- a/tests/ui/imports/issue-47623.stderr +++ b/tests/ui/imports/issue-47623.stderr @@ -4,6 +4,6 @@ error[E0429]: `self` imports are only allowed within a { } list LL | use self; | ^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0429`. diff --git a/tests/ui/imports/issue-53512.stderr b/tests/ui/imports/issue-53512.stderr index 05fe111b3..6bcba1ad4 100644 --- a/tests/ui/imports/issue-53512.stderr +++ b/tests/ui/imports/issue-53512.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `m::assert` LL | use m::assert; | ^^^^^^^^^ no `assert` in `m` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-55884-1.stderr b/tests/ui/imports/issue-55884-1.stderr index c38166dde..ae8edb049 100644 --- a/tests/ui/imports/issue-55884-1.stderr +++ b/tests/ui/imports/issue-55884-1.stderr @@ -18,6 +18,6 @@ LL | pub use self::m2::*; | ^^^^^^^^^^^ = help: consider adding an explicit import of `S` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/issue-55884-2.stderr b/tests/ui/imports/issue-55884-2.stderr index 67d411414..8a9d5f2a6 100644 --- a/tests/ui/imports/issue-55884-2.stderr +++ b/tests/ui/imports/issue-55884-2.stderr @@ -13,18 +13,22 @@ note: ...and refers to the struct import `ParseOptions` which is defined here... --> $DIR/issue-55884-2.rs:13:9 | LL | pub use parser::ParseOptions; - | ^^^^^^^^^^^^^^^^^^^^ consider importing it directly + | ^^^^^^^^^^^^^^^^^^^^ you could import this re-export note: ...and refers to the struct import `ParseOptions` which is defined here... --> $DIR/issue-55884-2.rs:6:13 | LL | pub use options::*; - | ^^^^^^^^^^ consider importing it directly + | ^^^^^^^^^^ you could import this re-export note: ...and refers to the struct `ParseOptions` which is defined here --> $DIR/issue-55884-2.rs:2:5 | LL | pub struct ParseOptions {} - | ^^^^^^^^^^^^^^^^^^^^^^^ consider importing it directly + | ^^^^^^^^^^^^^^^^^^^^^^^ you could import this directly +help: import `ParseOptions` through the re-export + | +LL | pub use parser::ParseOptions; + | ~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0603`. diff --git a/tests/ui/imports/issue-57015.stderr b/tests/ui/imports/issue-57015.stderr index 5374ba3dc..f1ae78452 100644 --- a/tests/ui/imports/issue-57015.stderr +++ b/tests/ui/imports/issue-57015.stderr @@ -9,6 +9,6 @@ help: consider importing this module instead LL | use glob_ok::something; | ~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-57539.stderr b/tests/ui/imports/issue-57539.stderr index 88cc42ccf..c8473cc85 100644 --- a/tests/ui/imports/issue-57539.stderr +++ b/tests/ui/imports/issue-57539.stderr @@ -15,6 +15,6 @@ LL | use crate::*; = help: consider adding an explicit import of `core` to disambiguate = help: or use `self::core` to refer to this module unambiguously -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/issue-81413.stderr b/tests/ui/imports/issue-81413.stderr index e2dfe02bc..c2a321250 100644 --- a/tests/ui/imports/issue-81413.stderr +++ b/tests/ui/imports/issue-81413.stderr @@ -6,6 +6,6 @@ LL | pub use doesnt_exist::*; | = help: consider adding `extern crate doesnt_exist` to use the `doesnt_exist` crate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-85992.stderr b/tests/ui/imports/issue-85992.stderr index 810d41009..6c75b45d9 100644 --- a/tests/ui/imports/issue-85992.stderr +++ b/tests/ui/imports/issue-85992.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `crate::issue_85992_extern_2` LL | use crate::issue_85992_extern_2; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `issue_85992_extern_2` in the root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-8640.stderr b/tests/ui/imports/issue-8640.stderr index ab44f067f..ea350e97e 100644 --- a/tests/ui/imports/issue-8640.stderr +++ b/tests/ui/imports/issue-8640.stderr @@ -12,6 +12,6 @@ help: you can use `as` to change the binding name of the import LL | use baz::bar as other_bar; | ~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0255`. diff --git a/tests/ui/imports/issue-99695-b.stderr b/tests/ui/imports/issue-99695-b.stderr index b6f5c726a..d58d27987 100644 --- a/tests/ui/imports/issue-99695-b.stderr +++ b/tests/ui/imports/issue-99695-b.stderr @@ -11,6 +11,6 @@ LL ~ use ::nu; LL ~ pub use self::p::{other_item as _}; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-99695.stderr b/tests/ui/imports/issue-99695.stderr index 0ef762e1c..536f51dcb 100644 --- a/tests/ui/imports/issue-99695.stderr +++ b/tests/ui/imports/issue-99695.stderr @@ -11,6 +11,6 @@ LL ~ use ::nu; LL ~ pub use self::{other_item as _}; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/no-pub-reexports-but-used.rs b/tests/ui/imports/no-pub-reexports-but-used.rs new file mode 100644 index 000000000..28991bde8 --- /dev/null +++ b/tests/ui/imports/no-pub-reexports-but-used.rs @@ -0,0 +1,15 @@ +// check-pass +// https://github.com/rust-lang/rust/issues/115966 + +mod m { + pub(crate) type A = u8; +} + +#[warn(unused_imports)] //~ NOTE: the lint level is defined here +pub use m::*; +//~^ WARNING: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough +//~| NOTE: the most public imported item is `pub(crate)` + +fn main() { + let _: A; +} diff --git a/tests/ui/imports/no-pub-reexports-but-used.stderr b/tests/ui/imports/no-pub-reexports-but-used.stderr new file mode 100644 index 000000000..b693dea19 --- /dev/null +++ b/tests/ui/imports/no-pub-reexports-but-used.stderr @@ -0,0 +1,20 @@ +warning: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough + --> $DIR/no-pub-reexports-but-used.rs:9:9 + | +LL | pub use m::*; + | ^^^^ + | +note: the most public imported item is `pub(crate)` + --> $DIR/no-pub-reexports-but-used.rs:9:9 + | +LL | pub use m::*; + | ^^^^ + = help: reduce the glob import's visibility or increase visibility of imported items +note: the lint level is defined here + --> $DIR/no-pub-reexports-but-used.rs:8:8 + | +LL | #[warn(unused_imports)] + | ^^^^^^^^^^^^^^ + +warning: 1 warning emitted + diff --git a/tests/ui/imports/no-std-inject.stderr b/tests/ui/imports/no-std-inject.stderr index 8e2268048..597ecdce9 100644 --- a/tests/ui/imports/no-std-inject.stderr +++ b/tests/ui/imports/no-std-inject.stderr @@ -10,6 +10,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate core as other_core; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0259`. diff --git a/tests/ui/imports/overlapping_pub_trait.stderr b/tests/ui/imports/overlapping_pub_trait.stderr index 490dccd3e..a82a4101c 100644 --- a/tests/ui/imports/overlapping_pub_trait.stderr +++ b/tests/ui/imports/overlapping_pub_trait.stderr @@ -15,6 +15,6 @@ help: the following trait is implemented but not in scope; perhaps add a `use` f LL + use overlapping_pub_trait_source::m::Tr; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/imports/private-std-reexport-suggest-public.fixed b/tests/ui/imports/private-std-reexport-suggest-public.fixed new file mode 100644 index 000000000..b6fd22f5d --- /dev/null +++ b/tests/ui/imports/private-std-reexport-suggest-public.fixed @@ -0,0 +1,9 @@ +// run-rustfix +#![allow(unused_imports)] +fn main() { + use std::mem; //~ ERROR module import `mem` is private +} + +pub mod foo { + use std::mem; +} diff --git a/tests/ui/imports/private-std-reexport-suggest-public.rs b/tests/ui/imports/private-std-reexport-suggest-public.rs new file mode 100644 index 000000000..1247055af --- /dev/null +++ b/tests/ui/imports/private-std-reexport-suggest-public.rs @@ -0,0 +1,9 @@ +// run-rustfix +#![allow(unused_imports)] +fn main() { + use foo::mem; //~ ERROR module import `mem` is private +} + +pub mod foo { + use std::mem; +} diff --git a/tests/ui/imports/private-std-reexport-suggest-public.stderr b/tests/ui/imports/private-std-reexport-suggest-public.stderr new file mode 100644 index 000000000..222553235 --- /dev/null +++ b/tests/ui/imports/private-std-reexport-suggest-public.stderr @@ -0,0 +1,23 @@ +error[E0603]: module import `mem` is private + --> $DIR/private-std-reexport-suggest-public.rs:4:14 + | +LL | use foo::mem; + | ^^^ private module import + | +note: the module import `mem` is defined here... + --> $DIR/private-std-reexport-suggest-public.rs:8:9 + | +LL | use std::mem; + | ^^^^^^^^ +note: ...and refers to the module `mem` which is defined here + --> $SRC_DIR/std/src/lib.rs:LL:COL + | + = note: you could import this directly +help: import `mem` through the re-export + | +LL | use std::mem; + | ~~~~~~~~ + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0603`. diff --git a/tests/ui/imports/reexports.rs b/tests/ui/imports/reexports.rs index cb1a3ebe1..2a1a62834 100644 --- a/tests/ui/imports/reexports.rs +++ b/tests/ui/imports/reexports.rs @@ -9,7 +9,7 @@ mod a { //~^ ERROR cannot be re-exported //~| WARNING unused import: `super::foo` pub use super::*; - //~^ WARNING glob import doesn't reexport anything because no candidate is public enough + //~^ WARNING glob import doesn't reexport anything with visibility `pub` because no imported item is public enough //~| WARNING unused import: `super::*` } } diff --git a/tests/ui/imports/reexports.stderr b/tests/ui/imports/reexports.stderr index 401e422af..bf4ba4748 100644 --- a/tests/ui/imports/reexports.stderr +++ b/tests/ui/imports/reexports.stderr @@ -56,11 +56,18 @@ note: the lint level is defined here LL | #![warn(unused_imports)] | ^^^^^^^^^^^^^^ -warning: glob import doesn't reexport anything because no candidate is public enough +warning: glob import doesn't reexport anything with visibility `pub` because no imported item is public enough --> $DIR/reexports.rs:11:17 | LL | pub use super::*; | ^^^^^^^^ + | +note: the most public imported item is `pub(a)` + --> $DIR/reexports.rs:11:17 + | +LL | pub use super::*; + | ^^^^^^^^ + = help: reduce the glob import's visibility or increase visibility of imported items warning: unused import: `super::*` --> $DIR/reexports.rs:11:17 diff --git a/tests/ui/imports/resolve-other-libc.stderr b/tests/ui/imports/resolve-other-libc.stderr index e57b88e50..81fe12946 100644 --- a/tests/ui/imports/resolve-other-libc.stderr +++ b/tests/ui/imports/resolve-other-libc.stderr @@ -4,5 +4,5 @@ error: extern location for libc does not exist: test.rlib LL | extern crate libc; | ^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/rfc-1560-warning-cycle.stderr b/tests/ui/imports/rfc-1560-warning-cycle.stderr index fd7e99165..8a83e5813 100644 --- a/tests/ui/imports/rfc-1560-warning-cycle.stderr +++ b/tests/ui/imports/rfc-1560-warning-cycle.stderr @@ -18,6 +18,6 @@ LL | use bar::*; | ^^^^^^ = help: consider adding an explicit import of `Foo` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/imports/unnamed_pub_trait.stderr b/tests/ui/imports/unnamed_pub_trait.stderr index 5133273c2..41772b8e6 100644 --- a/tests/ui/imports/unnamed_pub_trait.stderr +++ b/tests/ui/imports/unnamed_pub_trait.stderr @@ -15,6 +15,6 @@ help: the following trait is implemented but not in scope; perhaps add a `use` f LL + use unnamed_pub_trait_source::prelude::*; // trait Tr | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/imports/unused-import-issue-87973.stderr b/tests/ui/imports/unused-import-issue-87973.stderr index 81b7ea791..a43e92b14 100644 --- a/tests/ui/imports/unused-import-issue-87973.stderr +++ b/tests/ui/imports/unused-import-issue-87973.stderr @@ -10,5 +10,5 @@ note: the lint level is defined here LL | #![deny(unused_imports)] | ^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/imports/unused.stderr b/tests/ui/imports/unused.stderr index 08128d794..a76c3c87a 100644 --- a/tests/ui/imports/unused.stderr +++ b/tests/ui/imports/unused.stderr @@ -11,5 +11,5 @@ LL | #![deny(unused)] | ^^^^^^ = note: `#[deny(unused_imports)]` implied by `#[deny(unused)]` -error: aborting due to previous error +error: aborting due to 1 previous error |