mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 16:24:46 +00:00
Update UI tests for primitive type ambiguity error renaming
This commit is contained in:
parent
95926b2ce5
commit
ec43cb3e9c
@ -35,6 +35,6 @@ pub mod foo {
|
||||
/// Ambiguous non-implied shortcut link [`foo::bar`]. //~ERROR `foo::bar`
|
||||
pub struct Docs {}
|
||||
|
||||
/// [true] //~ ERROR `true` is both a module and a builtin type
|
||||
/// [true] //~ ERROR `true` is both a module and a primitive type
|
||||
/// [primitive@true]
|
||||
pub mod r#true {}
|
||||
|
@ -1,4 +1,4 @@
|
||||
error: `true` is both a module and a builtin type
|
||||
error: `true` is both a module and a primitive type
|
||||
--> $DIR/ambiguity.rs:38:6
|
||||
|
|
||||
LL | /// [true]
|
||||
@ -13,7 +13,7 @@ help: to link to the module, prefix with `mod@`
|
||||
|
|
||||
LL | /// [mod@true]
|
||||
| ++++
|
||||
help: to link to the builtin type, prefix with `prim@`
|
||||
help: to link to the primitive type, prefix with `prim@`
|
||||
|
|
||||
LL | /// [prim@true]
|
||||
| +++++
|
||||
|
@ -54,11 +54,11 @@
|
||||
|
||||
/// [u8::not_found]
|
||||
//~^ ERROR unresolved link
|
||||
//~| NOTE the builtin type `u8` has no associated item named `not_found`
|
||||
//~| NOTE the primitive type `u8` has no associated item named `not_found`
|
||||
|
||||
/// [std::primitive::u8::not_found]
|
||||
//~^ ERROR unresolved link
|
||||
//~| NOTE the builtin type `u8` has no associated item named `not_found`
|
||||
//~| NOTE the primitive type `u8` has no associated item named `not_found`
|
||||
|
||||
/// [type@Vec::into_iter]
|
||||
//~^ ERROR unresolved link
|
||||
|
@ -80,13 +80,13 @@ error: unresolved link to `u8::not_found`
|
||||
--> $DIR/errors.rs:55:6
|
||||
|
|
||||
LL | /// [u8::not_found]
|
||||
| ^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
|
||||
| ^^^^^^^^^^^^^ the primitive type `u8` has no associated item named `not_found`
|
||||
|
||||
error: unresolved link to `std::primitive::u8::not_found`
|
||||
--> $DIR/errors.rs:59:6
|
||||
|
|
||||
LL | /// [std::primitive::u8::not_found]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the primitive type `u8` has no associated item named `not_found`
|
||||
|
||||
error: unresolved link to `Vec::into_iter`
|
||||
--> $DIR/errors.rs:63:6
|
||||
|
@ -2,7 +2,7 @@
|
||||
#![allow(nonstandard_style)]
|
||||
|
||||
/// [`u32::MAX`]
|
||||
//~^ ERROR both an associated constant and a builtin type
|
||||
//~^ ERROR both an associated constant and a primitive type
|
||||
pub mod u32 {
|
||||
pub use std::primitive::u32 as MAX;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
error: `u32::MAX` is both an associated constant and a builtin type
|
||||
error: `u32::MAX` is both an associated constant and a primitive type
|
||||
--> $DIR/issue-108653-associated-items-6.rs:4:7
|
||||
|
|
||||
LL | /// [`u32::MAX`]
|
||||
@ -13,7 +13,7 @@ help: to link to the associated constant, prefix with `const@`
|
||||
|
|
||||
LL | /// [`const@u32::MAX`]
|
||||
| ++++++
|
||||
help: to link to the builtin type, prefix with `prim@`
|
||||
help: to link to the primitive type, prefix with `prim@`
|
||||
|
|
||||
LL | /// [`prim@u32::MAX`]
|
||||
| +++++
|
||||
|
@ -39,25 +39,25 @@ error: unresolved link to `unit::eq`
|
||||
--> $DIR/non-path-primitives.rs:28:6
|
||||
|
|
||||
LL | //! [unit::eq]
|
||||
| ^^^^^^^^ the builtin type `unit` has no associated item named `eq`
|
||||
| ^^^^^^^^ the primitive type `unit` has no associated item named `eq`
|
||||
|
||||
error: unresolved link to `tuple::eq`
|
||||
--> $DIR/non-path-primitives.rs:29:6
|
||||
|
|
||||
LL | //! [tuple::eq]
|
||||
| ^^^^^^^^^ the builtin type `tuple` has no associated item named `eq`
|
||||
| ^^^^^^^^^ the primitive type `tuple` has no associated item named `eq`
|
||||
|
||||
error: unresolved link to `fn::eq`
|
||||
--> $DIR/non-path-primitives.rs:30:6
|
||||
|
|
||||
LL | //! [fn::eq]
|
||||
| ^^^^^^ the builtin type `fn` has no associated item named `eq`
|
||||
| ^^^^^^ the primitive type `fn` has no associated item named `eq`
|
||||
|
||||
error: unresolved link to `reference::deref`
|
||||
--> $DIR/non-path-primitives.rs:34:6
|
||||
|
|
||||
LL | //! [reference::deref]
|
||||
| ^^^^^^^^^^^^^^^^ the builtin type `reference` has no associated item named `deref`
|
||||
| ^^^^^^^^^^^^^^^^ the primitive type `reference` has no associated item named `deref`
|
||||
|
||||
error: aborting due to 8 previous errors
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
//~^ NOTE lint level is defined
|
||||
|
||||
/// [char]
|
||||
//~^ ERROR both a module and a builtin type
|
||||
//~^ ERROR both a module and a primitive type
|
||||
//~| NOTE ambiguous link
|
||||
//~| HELP to link to the module
|
||||
//~| HELP to link to the builtin type
|
||||
//~| HELP to link to the primitive type
|
||||
|
||||
/// [type@char]
|
||||
//~^ ERROR both a module and a builtin type
|
||||
//~^ ERROR both a module and a primitive type
|
||||
//~| NOTE ambiguous link
|
||||
//~| HELP to link to the module
|
||||
//~| HELP to link to the builtin type
|
||||
//~| HELP to link to the primitive type
|
||||
|
||||
/// [mod@char] // ok
|
||||
/// [prim@char] // ok
|
||||
@ -26,5 +26,5 @@ pub mod inner {
|
||||
//! [struct@char]
|
||||
//~^ ERROR incompatible link
|
||||
//~| HELP prefix with `prim@`
|
||||
//~| NOTE resolved to a builtin type
|
||||
//~| NOTE resolved to a primitive type
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
error: `char` is both a module and a builtin type
|
||||
error: `char` is both a module and a primitive type
|
||||
--> $DIR/prim-conflict.rs:4:6
|
||||
|
|
||||
LL | /// [char]
|
||||
@ -13,12 +13,12 @@ help: to link to the module, prefix with `mod@`
|
||||
|
|
||||
LL | /// [mod@char]
|
||||
| ++++
|
||||
help: to link to the builtin type, prefix with `prim@`
|
||||
help: to link to the primitive type, prefix with `prim@`
|
||||
|
|
||||
LL | /// [prim@char]
|
||||
| +++++
|
||||
|
||||
error: `char` is both a module and a builtin type
|
||||
error: `char` is both a module and a primitive type
|
||||
--> $DIR/prim-conflict.rs:10:6
|
||||
|
|
||||
LL | /// [type@char]
|
||||
@ -28,7 +28,7 @@ help: to link to the module, prefix with `mod@`
|
||||
|
|
||||
LL | /// [mod@char]
|
||||
| ~~~~
|
||||
help: to link to the builtin type, prefix with `prim@`
|
||||
help: to link to the primitive type, prefix with `prim@`
|
||||
|
|
||||
LL | /// [prim@char]
|
||||
| ~~~~~
|
||||
@ -48,9 +48,9 @@ error: incompatible link kind for `char`
|
||||
--> $DIR/prim-conflict.rs:26:10
|
||||
|
|
||||
LL | //! [struct@char]
|
||||
| ^^^^^^^^^^^ this link resolved to a builtin type, which is not a struct
|
||||
| ^^^^^^^^^^^ this link resolved to a primitive type, which is not a struct
|
||||
|
|
||||
help: to link to the builtin type, prefix with `prim@`
|
||||
help: to link to the primitive type, prefix with `prim@`
|
||||
|
|
||||
LL | //! [prim@char]
|
||||
| ~~~~~
|
||||
|
Loading…
Reference in New Issue
Block a user