Skip to content

Commit 74b22c9

Browse files
authored
Rollup merge of #63289 - kornelski:missingcrate, r=zackmdavis
Don't recommend `extern crate` syntax `extern crate` syntax is not a good recommendation any more, so I've changed it to just print a suggested crate name.
2 parents fea43aa + 3bfb4c3 commit 74b22c9

19 files changed

+27
-27
lines changed

src/librustc_resolve/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4084,7 +4084,7 @@ impl<'a> Resolver<'a> {
40844084
)),
40854085
)
40864086
} else if !ident.is_reserved() {
4087-
(format!("maybe a missing `extern crate {};`?", ident), None)
4087+
(format!("maybe a missing crate `{}`?", ident), None)
40884088
} else {
40894089
// the parser will already have complained about the keyword being used
40904090
return PathResult::NonModule(PartialRes::new(Res::Err));

src/test/ui/error-codes/E0432.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `something`
22
--> $DIR/E0432.rs:1:5
33
|
44
LL | use something::Foo;
5-
| ^^^^^^^^^ maybe a missing `extern crate something;`?
5+
| ^^^^^^^^^ maybe a missing crate `something`?
66

77
error: aborting due to previous error
88

src/test/ui/extern-prelude-fail.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0432]: unresolved import `extern_prelude`
22
--> $DIR/extern-prelude-fail.rs:7:9
33
|
44
LL | use extern_prelude::S;
5-
| ^^^^^^^^^^^^^^ maybe a missing `extern crate extern_prelude;`?
5+
| ^^^^^^^^^^^^^^ maybe a missing crate `extern_prelude`?
66

7-
error[E0433]: failed to resolve: maybe a missing `extern crate extern_prelude;`?
7+
error[E0433]: failed to resolve: maybe a missing crate `extern_prelude`?
88
--> $DIR/extern-prelude-fail.rs:8:15
99
|
1010
LL | let s = ::extern_prelude::S;
11-
| ^^^^^^^^^^^^^^ maybe a missing `extern crate extern_prelude;`?
11+
| ^^^^^^^^^^^^^^ maybe a missing crate `extern_prelude`?
1212

1313
error: aborting due to 2 previous errors
1414

src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0432]: unresolved import `core`
22
--> $DIR/feature-gate-extern_absolute_paths.rs:1:5
33
|
44
LL | use core::default;
5-
| ^^^^ maybe a missing `extern crate core;`?
5+
| ^^^^ maybe a missing crate `core`?
66

7-
error[E0433]: failed to resolve: maybe a missing `extern crate core;`?
7+
error[E0433]: failed to resolve: maybe a missing crate `core`?
88
--> $DIR/feature-gate-extern_absolute_paths.rs:4:19
99
|
1010
LL | let _: u8 = ::core::default::Default();
11-
| ^^^^ maybe a missing `extern crate core;`?
11+
| ^^^^ maybe a missing crate `core`?
1212

1313
error: aborting due to 2 previous errors
1414

src/test/ui/import3.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `main`
22
--> $DIR/import3.rs:2:5
33
|
44
LL | use main::bar;
5-
| ^^^^ maybe a missing `extern crate main;`?
5+
| ^^^^ maybe a missing crate `main`?
66

77
error: aborting due to previous error
88

src/test/ui/imports/issue-53269.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `nonexistent_module`
22
--> $DIR/issue-53269.rs:6:9
33
|
44
LL | use nonexistent_module::mac;
5-
| ^^^^^^^^^^^^^^^^^^ maybe a missing `extern crate nonexistent_module;`?
5+
| ^^^^^^^^^^^^^^^^^^ maybe a missing crate `nonexistent_module`?
66

77
error[E0659]: `mac` is ambiguous (`macro_rules` vs non-`macro_rules` from other module)
88
--> $DIR/issue-53269.rs:8:5

src/test/ui/imports/issue-55457.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error[E0432]: unresolved import `non_existent`
1111
--> $DIR/issue-55457.rs:2:5
1212
|
1313
LL | use non_existent::non_existent;
14-
| ^^^^^^^^^^^^ maybe a missing `extern crate non_existent;`?
14+
| ^^^^^^^^^^^^ maybe a missing crate `non_existent`?
1515

1616
error: cannot determine resolution for the derive macro `NonExistent`
1717
--> $DIR/issue-55457.rs:5:10

src/test/ui/imports/unresolved-imports-used.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ error[E0432]: unresolved import `foo`
88
--> $DIR/unresolved-imports-used.rs:10:5
99
|
1010
LL | use foo::bar;
11-
| ^^^ maybe a missing `extern crate foo;`?
11+
| ^^^ maybe a missing crate `foo`?
1212

1313
error[E0603]: function `quz` is private
1414
--> $DIR/unresolved-imports-used.rs:8:10

src/test/ui/issues/issue-1697.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Testing that we don't fail abnormally after hitting the errors
22

33
use unresolved::*; //~ ERROR unresolved import `unresolved` [E0432]
4-
//~^ maybe a missing `extern crate unresolved;`?
4+
//~^ maybe a missing crate `unresolved`?
55

66
fn main() {}

src/test/ui/issues/issue-1697.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `unresolved`
22
--> $DIR/issue-1697.rs:3:5
33
|
44
LL | use unresolved::*;
5-
| ^^^^^^^^^^ maybe a missing `extern crate unresolved;`?
5+
| ^^^^^^^^^^ maybe a missing crate `unresolved`?
66

77
error: aborting due to previous error
88

0 commit comments

Comments
 (0)