reword some path errors

estebank · estebank · commit a3964c232f4b · 2025-08-15T19:46:08.000Z
diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
@@ -1590,16 +1590,24 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     module,
                     || {
                         let name_str = if name == kw::PathRoot {
-                            "crate root".to_string()
+                            "the crate root".to_string()
                         } else {
                             format!("`{name}`")
                         };
-                        let label = if segment_idx == 1 && path[0].ident.name == kw::PathRoot {
-                            format!("global paths cannot start with {name_str}")
+                        let (message, label) = if segment_idx == 1
+                            && path[0].ident.name == kw::PathRoot
+                        {
+                            (
+                                format!("global paths cannot start with {name_str}"),
+                                "cannot start with this".to_string(),
+                            )
                         } else {
-                            format!("{name_str} in paths can only be used in start position")
+                            (
+                                format!("{name_str} in paths can only be used in start position"),
+                                "can only be used in path start position".to_string(),
+                            )
                         };
-                        (label.clone(), label, None)
+                        (message, label, None)
                     },
                 );
             }
diff --git a/tests/ui/delegation/bad-resolve.stderr b/tests/ui/delegation/bad-resolve.stderr
@@ -91,7 +91,7 @@ error[E0433]: `crate` in paths can only be used in start position
   --> $DIR/bad-resolve.rs:44:29
    |
 LL | reuse prefix::{self, super, crate};
-   |                             ^^^^^ `crate` in paths can only be used in start position
+   |                             ^^^^^ can only be used in path start position
 
 error: aborting due to 12 previous errors
 
diff --git a/tests/ui/dollar-crate/dollar-crate-is-keyword-2.rs b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.rs
@@ -5,9 +5,9 @@ macro_rules! m {
         use a::$crate; //~ ERROR: unresolved import `a::$crate`
         //~^ NOTE: no `$crate` in `a`
         use a::$crate::b; //~ ERROR: `$crate` in paths can only be used in start position
-        //~^ NOTE: `$crate` in paths can only be used in start position
+        //~^ NOTE: can only be used in path start position
         type A = a::$crate; //~ ERROR: `$crate` in paths can only be used in start position
-        //~^ NOTE: `$crate` in paths can only be used in start position
+        //~^ NOTE: can only be used in path start position
     }
 }
 
diff --git a/tests/ui/dollar-crate/dollar-crate-is-keyword-2.stderr b/tests/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
@@ -2,7 +2,7 @@ error[E0433]: `$crate` in paths can only be used in start position
   --> $DIR/dollar-crate-is-keyword-2.rs:7:16
    |
 LL |         use a::$crate::b;
-   |                ^^^^^^ `$crate` in paths can only be used in start position
+   |                ^^^^^^ can only be used in path start position
 ...
 LL | m!();
    | ---- in this macro invocation
@@ -24,7 +24,7 @@ error[E0433]: `$crate` in paths can only be used in start position
   --> $DIR/dollar-crate-is-keyword-2.rs:9:21
    |
 LL |         type A = a::$crate;
-   |                     ^^^^^^ `$crate` in paths can only be used in start position
+   |                     ^^^^^^ can only be used in path start position
 ...
 LL | m!();
    | ---- in this macro invocation
diff --git a/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr b/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr
@@ -1,20 +1,20 @@
-error[E0433]: crate root in paths can only be used in start position
+error[E0433]: the crate root in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:6:5
    |
 LL |     ::bar,
-   |     ^ crate root in paths can only be used in start position
+   |     ^ can only be used in path start position
 
 error[E0433]: `super` in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:8:5
    |
 LL |     super::bar,
-   |     ^^^^^ `super` in paths can only be used in start position
+   |     ^^^^^ can only be used in path start position
 
 error[E0433]: `self` in paths can only be used in start position
   --> $DIR/absolute-paths-in-nested-use-groups.rs:10:5
    |
 LL |     self::bar,
-   |     ^^^^ `self` in paths can only be used in start position
+   |     ^^^^ can only be used in path start position
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/tests/ui/rfcs/rfc-2126-crate-paths/crate-path-non-absolute.stderr
@@ -2,13 +2,13 @@ error[E0433]: `crate` in paths can only be used in start position
   --> $DIR/crate-path-non-absolute.rs:5:22
    |
 LL |         let s = ::m::crate::S;
-   |                      ^^^^^ `crate` in paths can only be used in start position
+   |                      ^^^^^ can only be used in path start position
 
 error[E0433]: global paths cannot start with `crate`
   --> $DIR/crate-path-non-absolute.rs:6:20
    |
 LL |         let s1 = ::crate::S;
-   |                    ^^^^^ global paths cannot start with `crate`
+   |                    ^^^^^ cannot start with this
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/use/use-super-global-path.stderr b/tests/ui/use/use-super-global-path.stderr
@@ -2,21 +2,21 @@ error[E0433]: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:7:11
    |
 LL |     use ::super::{S, Z};
-   |           ^^^^^ global paths cannot start with `super`
+   |           ^^^^^ cannot start with this
 
 error[E0433]: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:7:11
    |
 LL |     use ::super::{S, Z};
-   |           ^^^^^ global paths cannot start with `super`
+   |           ^^^^^ cannot start with this
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error[E0433]: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:12:15
    |
 LL |         use ::super::main;
-   |               ^^^^^ global paths cannot start with `super`
+   |               ^^^^^ cannot start with this
 
 error: aborting due to 3 previous errors
 

Original file line number	Diff line number	Diff line change
@@ -91,7 +91,7 @@ error[E0433]: `crate` in paths can only be used in start position
`91`	`91`	`--> $DIR/bad-resolve.rs:44:29`
`92`	`92`	`\|`
`93`	`93`	`LL \| reuse prefix::{self, super, crate};`
`94`		- \| ^^^^^ `crate` in paths can only be used in start position
	`94`	`+ \| ^^^^^ can only be used in path start position`
`95`	`95`
`96`	`96`	`error: aborting due to 12 previous errors`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ macro_rules! m {`
`5`	`5`	use a::$crate; //~ ERROR: unresolved import `a::$crate`
`6`	`6`	//~^ NOTE: no `$crate` in `a`
`7`	`7`	use a::$crate::b; //~ ERROR: `$crate` in paths can only be used in start position
`8`		- //~^ NOTE: `$crate` in paths can only be used in start position
	`8`	`+ //~^ NOTE: can only be used in path start position`
`9`	`9`	type A = a::$crate; //~ ERROR: `$crate` in paths can only be used in start position
`10`		- //~^ NOTE: `$crate` in paths can only be used in start position
	`10`	`+ //~^ NOTE: can only be used in path start position`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
@@ -2,13 +2,13 @@ error[E0433]: `crate` in paths can only be used in start position
`2`	`2`	`--> $DIR/crate-path-non-absolute.rs:5:22`
`3`	`3`	`\|`
`4`	`4`	`LL \| let s = ::m::crate::S;`
`5`		- \| ^^^^^ `crate` in paths can only be used in start position
	`5`	`+ \| ^^^^^ can only be used in path start position`
`6`	`6`
`7`	`7`	error[E0433]: global paths cannot start with `crate`
`8`	`8`	`--> $DIR/crate-path-non-absolute.rs:6:20`
`9`	`9`	`\|`
`10`	`10`	`LL \| let s1 = ::crate::S;`
`11`		- \| ^^^^^ global paths cannot start with `crate`
	`11`	`+ \| ^^^^^ cannot start with this`
`12`	`12`
`13`	`13`	`error: aborting due to 2 previous errors`
`14`	`14`
Original file line number	Diff line number	Diff line change
@@ -2,21 +2,21 @@ error[E0433]: global paths cannot start with `super`
`2`	`2`	`--> $DIR/use-super-global-path.rs:7:11`
`3`	`3`	`\|`
`4`	`4`	`LL \| use ::super::{S, Z};`
`5`		- \| ^^^^^ global paths cannot start with `super`
	`5`	`+ \| ^^^^^ cannot start with this`
`6`	`6`
`7`	`7`	error[E0433]: global paths cannot start with `super`
`8`	`8`	`--> $DIR/use-super-global-path.rs:7:11`
`9`	`9`	`\|`
`10`	`10`	`LL \| use ::super::{S, Z};`
`11`		- \| ^^^^^ global paths cannot start with `super`
	`11`	`+ \| ^^^^^ cannot start with this`
`12`	`12`	`\|`
`13`	`13`	= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
`14`	`14`
`15`	`15`	error[E0433]: global paths cannot start with `super`
`16`	`16`	`--> $DIR/use-super-global-path.rs:12:15`
`17`	`17`	`\|`
`18`	`18`	`LL \| use ::super::main;`
`19`		- \| ^^^^^ global paths cannot start with `super`
	`19`	`+ \| ^^^^^ cannot start with this`
`20`	`20`
`21`	`21`	`error: aborting due to 3 previous errors`
`22`	`22`