This new caching sometimes suppresses duplicate errors that occur in

different parts of the crate, so modify the test cases that were relying
on that to test distinct types etc.

Author: nikomatsakis

src/test/compile-fail/associated-types-path-2.rs

@@ -45,7 +45,6 @@ pub fn f1_uint_uint() {
 pub fn f1_uint_int() {
     f1(2u32, 4i32);
     //~^ ERROR the trait `Foo` is not implemented
-    //~| ERROR the trait `Foo` is not implemented
 }
 
 pub fn f2_int() {

src/test/compile-fail/dst-object-from-unsized-type.rs

@@ -12,6 +12,7 @@
 
 trait Foo { fn foo(&self) {} }
 impl Foo for str {}
+impl Foo for [u8] {}
 
 fn test1<T: ?Sized + Foo>(t: &T) {
     let u: &Foo = t;
@@ -28,9 +29,9 @@ fn test3() {
     //~^ ERROR `core::marker::Sized` is not implemented for the type `str`
 }
 
-fn test4() {
-    let _: &Foo = "hi" as &Foo;
-    //~^ ERROR `core::marker::Sized` is not implemented for the type `str`
+fn test4(x: &[u8]) {
+    let _: &Foo = x as &Foo;
+    //~^ ERROR `core::marker::Sized` is not implemented for the type `[u8]`
 }
 
 fn main() { }

src/test/compile-fail/kindck-impl-type-params.rs

@@ -50,8 +50,10 @@ fn foo2<'a>() {
 }
 
 fn foo3<'a>() {
-    let t: Box<S<String>> = box S(marker::PhantomData);
-    let a: Box<Gettable<String>> = t;
+    struct Foo; // does not impl Copy
+
+    let t: Box<S<Foo>> = box S(marker::PhantomData);
+    let a: Box<Gettable<Foo>> = t;
     //~^ ERROR the trait `core::marker::Copy` is not implemented
 }
 

src/test/compile-fail/trait-bounds-on-structs-and-enums.rs

@@ -52,7 +52,7 @@ struct TupleLike(
 );
 
 enum Enum {
-    DictionaryLike { field: Bar<i32> }, //~ ERROR not implemented
+    DictionaryLike { field: Bar<u8> }, //~ ERROR not implemented
 }
 
 trait PolyTrait<T>
@@ -62,7 +62,7 @@ trait PolyTrait<T>
 
 struct Struct;
 
-impl PolyTrait<Foo<usize>> for Struct {
+impl PolyTrait<Foo<u16>> for Struct {
 //~^ ERROR not implemented
 }
 

src/test/compile-fail/traits-negative-impls.rs

@@ -19,9 +19,6 @@ use std::marker::Send;
 
 struct Outer<T: Send>(T);
 
-struct TestType;
-impl !Send for TestType {}
-
 struct Outer2<T>(T);
 
 unsafe impl<T: Send> Sync for Outer2<T> {}
@@ -30,29 +27,41 @@ fn is_send<T: Send>(_: T) {}
 fn is_sync<T: Sync>(_: T) {}
 
 fn dummy() {
+    struct TestType;
+    impl !Send for TestType {}
+
     Outer(TestType);
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `dummy::TestType`
 
     is_send(TestType);
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `dummy::TestType`
 
     is_send((8, TestType));
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `dummy::TestType`
 }
 
 fn dummy2() {
+    struct TestType;
+    impl !Send for TestType {}
+
     is_send(Box::new(TestType));
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `dummy2::TestType`
 }
 
 fn dummy3() {
+    struct TestType;
+    impl !Send for TestType {}
+
     is_send(Box::new(Outer2(TestType)));
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `dummy3::TestType`
 }
 
 fn main() {
+    struct TestType;
+    impl !Send for TestType {}
+
     // This will complain about a missing Send impl because `Sync` is implement *just*
     // for T that are `Send`. Look at #20366 and #19950
     is_sync(Outer2(TestType));
-    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `TestType`
+    //~^ ERROR the trait `core::marker::Send` is not implemented for the type `main::TestType`
 }

src/test/compile-fail/typeck-default-trait-impl-trait-where-clause.rs

@@ -40,6 +40,6 @@ fn test() {
 }
 
 fn main() {
-    foo::<i32>();
-    //~^ ERROR the trait `NotImplemented` is not implemented for the type `core::option::Option<i32>`
+    foo::<u32>();
+    //~^ ERROR the trait `NotImplemented` is not implemented for the type `core::option::Option<u32>`
 }

src/test/compile-fail/unsized5.rs

@@ -24,7 +24,7 @@ struct S3 {
     g: [usize]
 }
 struct S4 {
-    f: str, //~ ERROR `core::marker::Sized` is not implemented
+    f: [u8], //~ ERROR `core::marker::Sized` is not implemented
     g: usize
 }
 enum E<X: ?Sized> {