update name in tests: ui, mir-opt, std, llvm cg

Author: shua

library/std/tests/type-name-unsized.rs

@@ -48,7 +48,7 @@ impl Trait for i32 {
 }
 
 fn bar<T: Trait>() {
-    check!(T::Assoc, "alloc::string::String");
+    check!(T::Assoc, "alloc::string::generic::String");
     check!(T, "i32");
 }
 

tests/codegen-llvm/annotate-moves/integration.rs

@@ -163,7 +163,7 @@ pub fn test_copy_ref(x: &ExplicitCopy) {
 // CHECK-DAG: ![[#ASSIGN_COPY2_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)u64[,;].*}},{{ *[0-9]+}}>"
 
 // CHECK-DAG: ![[#INIT_STRUCT_LOC]] = !DILocation({{.*}}scope: ![[#INIT_STRUCT_SCOPE:]]
-// CHECK-DAG: ![[#INIT_STRUCT_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<alloc::string::String,{{ *[0-9]+}}>"
+// CHECK-DAG: ![[#INIT_STRUCT_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{alloc::([a-z_]+::)+String<.+>}},{{ *[0-9]+}}>"
 
 // CHECK-DAG: ![[#TUPLE_MOVE_LOC]] = !DILocation({{.*}}scope: ![[#TUPLE_MOVE_SCOPE:]]
 // CHECK-DAG: ![[#TUPLE_MOVE_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)u64[,;].*}},{{ *[0-9]+}}>"
@@ -175,7 +175,7 @@ pub fn test_copy_ref(x: &ExplicitCopy) {
 // CHECK-DAG: ![[#COPY2_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)u64[,;].*}},{{ *[0-9]+}}>"
 
 // CHECK-DAG: ![[#ARRAY_MOVE_LOC]] = !DILocation({{.*}}scope: ![[#ARRAY_MOVE_SCOPE:]]
-// CHECK-DAG: ![[#ARRAY_MOVE_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)alloc::string::String[,;].*}},{{ *[0-9]+}}>"
+// CHECK-DAG: ![[#ARRAY_MOVE_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)alloc::([a-z_]+::)+String<.+>[,;].*}},{{ *[0-9]+}}>"
 
 // CHECK-DAG: ![[#FIELD_MOVE_LOC]] = !DILocation({{.*}}scope: ![[#FIELD_MOVE_SCOPE:]]
 // CHECK-DAG: ![[#FIELD_MOVE_SCOPE]] = {{(distinct )?}}!DISubprogram(name: "compiler_move<{{(array\$<|\[)u64[,;].*}},{{ *[0-9]+}}>"

tests/mir-opt/box_partial_move.rs

@@ -6,8 +6,8 @@
 // EMIT_MIR box_partial_move.maybe_move.ElaborateDrops.diff
 fn maybe_move(cond: bool, thing: Box<String>) -> Option<String> {
     // CHECK-LABEL: fn maybe_move(
-    // CHECK: let mut [[PTR:_[0-9]+]]: *const std::string::String;
-    // CHECK: [[PTR]] = copy ((_2.0: std::ptr::Unique<std::string::String>).0: std::ptr::NonNull<std::string::String>) as *const std::string::String (Transmute);
+    // CHECK: let mut [[PTR:_[0-9]+]]: *const std::string::generic::String;
+    // CHECK: [[PTR]] = copy ((_2.0: std::ptr::Unique<std::string::generic::String>).0: std::ptr::NonNull<std::string::generic::String>) as *const std::string::generic::String (Transmute);
     // CHECK: drop((*[[PTR]]))
     if cond { Some(*thing) } else { None }
 }

tests/mir-opt/ergonomic-clones/closure.rs

@@ -6,7 +6,7 @@ use std::clone::UseCloned;
 
 pub fn ergonomic_clone_closure_move() -> String {
     // CHECK-LABEL: fn ergonomic_clone_closure_move(
-    // CHECK: _0 = move (_1.0: std::string::String);
+    // CHECK: _0 = move (_1.0: std::string::generic::String);
     // CHECK-NOT: <String as Clone>::clone
     let s = String::from("hi");
 

tests/ui/issues/issue-53348.rs

@@ -10,6 +10,7 @@ fn main() {
         a = *i.to_string();
         //~^ ERROR mismatched types
         //~| NOTE expected `String`, found `str`
+        //~| NOTE expected struct `String`
         v2.push(a);
     }
 }

tests/ui/pattern/issue-115599.rs

@@ -1,7 +1,9 @@
+// Check that we do not ICE when matching uninitialized constant with constant pattern
+
 const CONST_STRING: String = String::new();
 
 fn main() {
     let empty_str = String::from("");
     if let CONST_STRING = empty_str {}
-    //~^ ERROR constant of non-structural type `Vec<u8>` in a pattern
+    //~^ ERROR constant of non-structural type `String` in a pattern
 }

tests/ui/resolve/dot-notation-type-namespace-suggest-path-sep.rs

@@ -8,11 +8,11 @@ mod foo {
 
 fn main() {
     let _ = String.new();
-    //~^ ERROR expected value, found struct `String`
+    //~^ ERROR expected value, found type alias `String`
     //~| HELP use the path separator
 
     let _ = String.default;
-    //~^ ERROR expected value, found struct `String`
+    //~^ ERROR expected value, found type alias `String`
     //~| HELP use the path separator
 
     let _ = Vec::<()>.with_capacity(1);

tests/ui/resolve/unresolved-segments-visibility.rs

@@ -6,6 +6,6 @@ extern crate alloc as b;
 mod foo {
     mod bar {
         pub(in crate::b::string::String::newy) extern crate alloc as e;
-        //~^ ERROR failed to resolve: `String` is a struct, not a module [E0433]
+        //~^ ERROR failed to resolve: `String` is a type alias, not a module [E0433]
     }
 }

tests/ui/static/bad-const-type.rs

@@ -1,4 +1,5 @@
 static i: String = 10;
 //~^ ERROR mismatched types
 //~| NOTE expected `String`, found integer
+//~| NOTE expected struct `String`
 fn main() { println!("{}", i); }

tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.rs

@@ -2,22 +2,22 @@ trait Bar {
     type Baz;
 }
 
-struct Foo<T> where T: Bar, <T as Bar>::Baz: String { //~ ERROR expected trait, found struct
+struct Foo<T> where T: Bar, <T as Bar>::Baz: String { //~ ERROR expected trait, found
     t: T,
 }
 
-struct Qux<'a, T> where T: Bar, <&'a T as Bar>::Baz: String { //~ ERROR expected trait, found struct
+struct Qux<'a, T> where T: Bar, <&'a T as Bar>::Baz: String { //~ ERROR expected trait, found
     t: &'a T,
 }
 
-fn foo<T: Bar>(_: T) where <T as Bar>::Baz: String { //~ ERROR expected trait, found struct
+fn foo<T: Bar>(_: T) where <T as Bar>::Baz: String { //~ ERROR expected trait, found
 }
 
 fn qux<'a, T: Bar>(_: &'a T) where <&'a T as Bar>::Baz: String { //~ ERROR expected trait, found
 }
 
 fn issue_95327() where <u8 as Unresolved>::Assoc: String {}
-//~^ ERROR expected trait, found struct
+//~^ ERROR expected trait, found
 //~| ERROR cannot find trait `Unresolved` in this scope
 
 fn main() {}