Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs b/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs
deleted file mode 100644
index cd3ccfee0..000000000
--- a/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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);
-}