Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/ui/statics/static-method-in-trait-with-tps-intracrate.rs b/tests/ui/statics/static-method-in-trait-with-tps-intracrate.rs
new file mode 100644
index 000000000..cd3ccfee0
--- /dev/null
+++ b/tests/ui/statics/static-method-in-trait-with-tps-intracrate.rs
@@ -0,0 +1,28 @@
+// run-pass
+#![allow(dead_code)]
+
+trait Deserializer {
+    fn read_int(&self) -> isize;
+}
+
+trait Deserializable<D:Deserializer> {
+    fn deserialize(d: &D) -> Self;
+}
+
+impl<D:Deserializer> Deserializable<D> for isize {
+    fn deserialize(d: &D) -> isize {
+        return d.read_int();
+    }
+}
+
+struct FromThinAir { dummy: () }
+
+impl Deserializer for FromThinAir {
+    fn read_int(&self) -> isize { 22 }
+}
+
+pub fn main() {
+    let d = FromThinAir { dummy: () };
+    let i: isize = Deserializable::deserialize(&d);
+    assert_eq!(i, 22);
+}