Adjust type path resolution error message

gcc/rust/ChangeLog:

	* resolve/rust-ast-resolve-type.cc
	(ResolveRelativeTypePath::go): Adjust error message to match
	the 2.0 name resolver.

gcc/testsuite/ChangeLog:

	* rust/compile/additional-trait-bounds2.rs: Adjust expected
	errors.
	* rust/compile/const_generics_4.rs: Likewise.
	* rust/compile/const_generics_7.rs: Likewise.
	* rust/compile/generic-default1.rs: Likewise.
	* rust/compile/generics5.rs: Likewise.
	* rust/compile/generics9.rs: Likewise.
	* rust/compile/issue-2423.rs: Likewise.
	* rust/compile/method2.rs: Likewise.
	* rust/compile/nr2/exclude: Remove entries.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>

10 files changed, 17 insertions, 23 deletions

diff --git a/gcc/rust/resolve/rust-ast-resolve-type.cc b/gcc/rust/resolve/rust-ast-resolve-type.cc
index 194a4d5..22af563 100644
--- a/gcc/rust/resolve/rust-ast-resolve-type.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-type.cc
@@ -316,7 +316,7 @@ ResolveRelativeTypePath::go (AST::TypePath &path, NodeId &resolved_node_id)
       else if (is_first_segment)
 	{
 	  rust_error_at (segment->get_locus (), ErrorCode::E0412,
-			 "failed to resolve TypePath: %s in this scope",
+			 "could not resolve type path %qs",
 			 segment->as_string ().c_str ());
 	  return false;
 	}
diff --git a/gcc/testsuite/rust/compile/additional-trait-bounds2.rs b/gcc/testsuite/rust/compile/additional-trait-bounds2.rs
index 843228a..1c49b75 100644
--- a/gcc/testsuite/rust/compile/additional-trait-bounds2.rs
+++ b/gcc/testsuite/rust/compile/additional-trait-bounds2.rs
@@ -6,4 +6,4 @@ pub unsafe auto trait Sync {}
 
 trait A {}
 
-impl dyn A + Send + Sync + NonExist {} // { dg-error "failed to resolve TypePath: NonExist in this scope" }
+impl dyn A + Send + Sync + NonExist {} // { dg-error "could not resolve type path .NonExist." }
diff --git a/gcc/testsuite/rust/compile/const_generics_4.rs b/gcc/testsuite/rust/compile/const_generics_4.rs
index b364d3b..2766e4c 100644
--- a/gcc/testsuite/rust/compile/const_generics_4.rs
+++ b/gcc/testsuite/rust/compile/const_generics_4.rs
@@ -4,4 +4,4 @@ const P: usize = 14;
 
 struct Foo<const N: usize = { M }>; // { dg-error "cannot find value .M. in this scope" }
 struct Bar<const N: usize = { P }>;
-struct Baz<const N: NotAType = { P }>; // { dg-error "failed to resolve TypePath: NotAType in this scope" }
+struct Baz<const N: NotAType = { P }>; // { dg-error "could not resolve type path .NotAType." }
diff --git a/gcc/testsuite/rust/compile/const_generics_7.rs b/gcc/testsuite/rust/compile/const_generics_7.rs
index 2c128db..dad4c21 100644
--- a/gcc/testsuite/rust/compile/const_generics_7.rs
+++ b/gcc/testsuite/rust/compile/const_generics_7.rs
@@ -1,17 +1,17 @@
 struct S<const N: usize>;
 
-pub fn foo<const N: FooBar>() {} // { dg-error "failed to resolve" }
-type Foo<const N: FooBar> = S<N>; // { dg-error "failed to resolve" }
-struct Foo2<const N: FooBar>; // { dg-error "failed to resolve" }
-enum Foo3<const N: FooBar> { // { dg-error "failed to resolve" }
+pub fn foo<const N: FooBar>() {} // { dg-error "could not resolve" }
+type Foo<const N: FooBar> = S<N>; // { dg-error "could not resolve" }
+struct Foo2<const N: FooBar>; // { dg-error "could not resolve" }
+enum Foo3<const N: FooBar> { // { dg-error "could not resolve" }
     Foo,
     Bar,
 }
-union Foo4<const N: FooBar> { // { dg-error "failed to resolve" }
+union Foo4<const N: FooBar> { // { dg-error "could not resolve" }
     a: usize,
     b: i32,
 }
-trait Fooable<const N: FooBar> {} // { dg-error "failed to resolve" }
+trait Fooable<const N: FooBar> {} // { dg-error "could not resolve" }
 
 trait Traitable {}
-impl<const N: FooBar> Traitable for Foo2<N> {} // { dg-error "failed to resolve" }
+impl<const N: FooBar> Traitable for Foo2<N> {} // { dg-error "could not resolve" }
diff --git a/gcc/testsuite/rust/compile/generic-default1.rs b/gcc/testsuite/rust/compile/generic-default1.rs
index 0a132bf..4155640 100644
--- a/gcc/testsuite/rust/compile/generic-default1.rs
+++ b/gcc/testsuite/rust/compile/generic-default1.rs
@@ -1,5 +1,5 @@
 struct Foo<A = i321>(A);
-// { dg-error "failed to resolve TypePath: i321" "" { target *-*-* } .-1 }
+// { dg-error "could not resolve type path .i321." "" { target *-*-* } .-1 }
 
 fn main() {
     let a;
diff --git a/gcc/testsuite/rust/compile/generics5.rs b/gcc/testsuite/rust/compile/generics5.rs
index 6c847b5..f861038 100644
--- a/gcc/testsuite/rust/compile/generics5.rs
+++ b/gcc/testsuite/rust/compile/generics5.rs
@@ -3,7 +3,7 @@ struct GenericStruct<T>(T, usize);
 fn main() {
     let a2;
     a2 = GenericStruct::<i8, T>(1, 456);
-    // { dg-error "failed to resolve TypePath: T" "" { target *-*-* } .-1 }
+    // { dg-error "could not resolve type path .T." "" { target *-*-* } .-1 }
 
     let b2: i32 = a2.0;
     let c2: usize = a2.1;
diff --git a/gcc/testsuite/rust/compile/generics9.rs b/gcc/testsuite/rust/compile/generics9.rs
index 3766703..3c787aa 100644
--- a/gcc/testsuite/rust/compile/generics9.rs
+++ b/gcc/testsuite/rust/compile/generics9.rs
@@ -1,5 +1,5 @@
 struct Foo<A, B = (A, B)>(A, B);
-// { dg-error "failed to resolve TypePath: B" "" { target *-*-* } .-1 }
+// { dg-error "could not resolve type path .B." "" { target *-*-* } .-1 }
 
 fn main() {
     let a: Foo<bool>;
diff --git a/gcc/testsuite/rust/compile/issue-2423.rs b/gcc/testsuite/rust/compile/issue-2423.rs
index ae7897c..6fcd32f 100644
--- a/gcc/testsuite/rust/compile/issue-2423.rs
+++ b/gcc/testsuite/rust/compile/issue-2423.rs
@@ -1,14 +1,14 @@
 impl NonExistant {
-    // { dg-error "failed to resolve" "" { target *-*-* } .-1 }
+    // { dg-error "could not resolve" "" { target *-*-* } .-1 }
     fn test() {}
 }
 
 impl NotFound for NonExistant {
-    // { dg-error "failed to resolve" "" { target *-*-* } .-1 }
+    // { dg-error "could not resolve" "" { target *-*-* } .-1 }
     fn test() {}
 }
 
 trait A {}
 
 impl A for NotFound {}
-// { dg-error "failed to resolve" "" { target *-*-* } .-1 }
+// { dg-error "could not resolve" "" { target *-*-* } .-1 }
diff --git a/gcc/testsuite/rust/compile/method2.rs b/gcc/testsuite/rust/compile/method2.rs
index c8699f7..961a039 100644
--- a/gcc/testsuite/rust/compile/method2.rs
+++ b/gcc/testsuite/rust/compile/method2.rs
@@ -12,5 +12,5 @@ fn main() {
 
     let b;
     b = a.test::<asfasfr>(false);
-    // { dg-error "failed to resolve TypePath: asfasfr" "" { target *-*-* } .-1 }
+    // { dg-error "could not resolve type path .asfasfr." "" { target *-*-* } .-1 }
 }
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index 345b1d5..6e17eca 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -4,11 +4,8 @@ cfg1.rs
 complex-path1.rs
 const_generics_3.rs
 const_generics_4.rs
-const_generics_7.rs
 derive_macro1.rs
 feature_rust_attri0.rs
-generic-default1.rs
-generics5.rs
 generics9.rs
 issue-1483.rs
 issue-1786.rs
@@ -28,7 +25,6 @@ macros/mbe/macro43.rs
 macros/mbe/macro44.rs
 macros/mbe/macro6.rs
 macros/mbe/macro_use1.rs
-method2.rs
 multiple_bindings1.rs
 multiple_bindings2.rs
 nested_macro_use1.rs
@@ -58,9 +54,7 @@ issue-3033.rs
 issue-3009.rs
 issue-2953-2.rs
 issue-2905-2.rs
-issue-2423.rs
 issue-266.rs
-additional-trait-bounds2.rs
 derive_clone_enum1.rs
 derive_clone_enum2.rs
 derive_clone_enum3.rs