Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 25 deletions

diff --git a/src/test/ui/issues/issue-13204.rs b/src/test/ui/issues/issue-13204.rs
deleted file mode 100644
index 3d6aba845..000000000
--- a/src/test/ui/issues/issue-13204.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-#![allow(unused_mut)]
-// Test that when instantiating trait default methods, typeck handles
-// lifetime parameters defined on the method bound correctly.
-
-
-pub trait Foo {
-    fn bar<'a, I: Iterator<Item=&'a ()>>(&self, it: I) -> usize {
-        let mut xs = it.filter(|_| true);
-        xs.count()
-    }
-}
-
-pub struct Baz;
-
-impl Foo for Baz {
-    // When instantiating `Foo::bar` for `Baz` here, typeck used to
-    // ICE due to the lifetime parameter of `bar`.
-}
-
-fn main() {
-    let x = Baz;
-    let y = vec![(), (), ()];
-    assert_eq!(x.bar(y.iter()), 3);
-}