Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-13204.rs b/tests/ui/issues/issue-13204.rs
new file mode 100644
index 000000000..3d6aba845
--- /dev/null
+++ b/tests/ui/issues/issue-13204.rs
@@ -0,0 +1,25 @@
+// 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);
+}