From dc8ce4c139d9f75557fdccad0795d0a149f29d68 Mon Sep 17 00:00:00 2001
From: Matthew Jasper <mjjasper1@gmail.com>
Date: Sun, 6 May 2018 22:57:49 +0100
Subject: [PATCH] Update existing tests for trivial bounds changes

---
 src/test/compile-fail/cross-fn-cache-hole.rs | 7 +++----
 src/test/compile-fail/issue-42796.rs         | 2 +-
 src/test/ui/issue-48728.stderr               | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/test/compile-fail/cross-fn-cache-hole.rs b/src/test/compile-fail/cross-fn-cache-hole.rs
index b034fedb805..d437fc019fd 100644
--- a/src/test/compile-fail/cross-fn-cache-hole.rs
+++ b/src/test/compile-fail/cross-fn-cache-hole.rs
@@ -11,10 +11,9 @@
 // Check that when there are vacuous predicates in the environment
 // (which make a fn uncallable) we don't erroneously cache those and
 // then consider them satisfied elsewhere. The current technique for
-// doing this is just to filter "global" predicates out of the
-// environment, which means that we wind up with an error in the
-// function `vacuous`, because even though `i32: Bar<u32>` is implied
-// by its where clause, that where clause never holds.
+// doing this is to not use global caches when there is a chance that
+// the environment contains such a predicate.
+// We still error for `i32: Bar<u32>` pending #48214
 
 trait Foo<X,Y>: Bar<X> {
 }
diff --git a/src/test/compile-fail/issue-42796.rs b/src/test/compile-fail/issue-42796.rs
index 10622eccbdc..b07c23c3fc7 100644
--- a/src/test/compile-fail/issue-42796.rs
+++ b/src/test/compile-fail/issue-42796.rs
@@ -17,7 +17,7 @@ impl<T, Smoke> Mirror<Smoke> for T {
 }
 
 pub fn poison<S>(victim: String) where <String as Mirror<S>>::Image: Copy {
-    loop { drop(victim); } //~ ERROR use of moved value
+    loop { drop(victim); }
 }
 
 fn main() {
diff --git a/src/test/ui/issue-48728.stderr b/src/test/ui/issue-48728.stderr
index 05c87fe66ee..937266d6d55 100644
--- a/src/test/ui/issue-48728.stderr
+++ b/src/test/ui/issue-48728.stderr
@@ -6,6 +6,8 @@ LL | #[derive(Clone)] //~ ERROR conflicting implementations of trait `std::clone
 ...
 LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
    | ------------------------------------------- first implementation here
+   |
+   = note: upstream crates may add new impl of trait `std::clone::Clone` for type `[_]` in future versions
 
 error: aborting due to previous error
 
-- 
2.44.0