Auto merge of #27096 - apasel422:issue-26217, r=nikomatsakis

closes #26217

r? @nikomatsakis 

2 files changed, 16 insertions, 4 deletions

diff --git a/src/test/compile-fail/issue-26217.rs b/src/test/compile-fail/issue-26217.rs
new file mode 100644
index 00000000000..06a8fe52588
--- /dev/null
+++ b/src/test/compile-fail/issue-26217.rs
@@ -0,0 +1,16 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn foo<T>() where for<'a> T: 'a {}
+
+fn main<'a>() {
+    foo::<&'a i32>();
+    //~^ ERROR the type `&'a i32` does not fulfill the required lifetime
+}
diff --git a/src/test/compile-fail/hrtb-type-outlives.rs b/src/test/run-pass/hrtb-type-outlives.rs
index 7bb74d6b03a..083f042fec2 100644
--- a/src/test/compile-fail/hrtb-type-outlives.rs
+++ b/src/test/run-pass/hrtb-type-outlives.rs
@@ -34,10 +34,7 @@ impl<'a,X> Foo<&'a isize> for SomeStruct<X>
 }
 
 fn one() {
-    // In fact there is no good reason for this to be an error, but
-    // whatever, I'm mostly concerned it doesn't ICE right now:
     want_foo::<SomeStruct<usize>>();
-    //~^ ERROR requirement `for<'a> usize : 'a` is not satisfied
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -53,7 +50,6 @@ impl<'a,X:'a> Foo<&'a isize> for AnotherStruct<X>
 
 fn two() {
     want_foo::<AnotherStruct<usize>>();
-    //~^ ERROR requirement `for<'a> usize : 'a` is not satisfied
 }
 
 fn main() { }