Auto merge of #77379 - camelid:improve-wording-crate-resolution-error, r=davidtwco

bors · bors · commit 3bbc443cc665 · 2020-10-01T03:28:50.000Z
Improve wording for external crate resolution error

I think it reads better this way.
diff --git a/compiler/rustc_resolve/src/imports.rs b/compiler/rustc_resolve/src/imports.rs
@@ -1157,7 +1157,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                     }
                     _ => {
                         if !ident.is_path_segment_keyword() {
-                            format!("no `{}` external crate", ident)
+                            format!("no external crate `{}`", ident)
                         } else {
                             // HACK(eddyb) this shows up for `self` & `super`, which
                             // should work instead - for now keep the same error message.
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `ycrate`
   --> $DIR/non-existent-3.rs:3:5
    |
 LL | use ycrate;
-   |     ^^^^^^ no `ycrate` external crate
+   |     ^^^^^^ no external crate `ycrate`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/not-allowed.stderr
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `alloc`
   --> $DIR/not-allowed.rs:5:5
    |
 LL | use alloc;
-   |     ^^^^^ no `alloc` external crate
+   |     ^^^^^ no external crate `alloc`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {`
`1157`	`1157`	`}`
`1158`	`1158`	`_ => {`
`1159`	`1159`	`if !ident.is_path_segment_keyword() {`
`1160`		- format!("no `{}` external crate", ident)
	`1160`	+ format!("no external crate `{}`", ident)
`1161`	`1161`	`} else {`
`1162`	`1162`	// HACK(eddyb) this shows up for `self` & `super`, which
`1163`	`1163`	`// should work instead - for now keep the same error message.`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `ycrate`
`2`	`2`	`--> $DIR/non-existent-3.rs:3:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| use ycrate;`
`5`		- \| ^^^^^^ no `ycrate` external crate
	`5`	+ \| ^^^^^^ no external crate `ycrate`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0432]: unresolved import `alloc`
`2`	`2`	`--> $DIR/not-allowed.rs:5:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| use alloc;`
`5`		- \| ^^^^^ no `alloc` external crate
	`5`	+ \| ^^^^^ no external crate `alloc`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`