Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/statics/static-methods-in-traits2.rs b/src/test/ui/statics/static-methods-in-traits2.rs
deleted file mode 100644
index 2c43ff6a7..000000000
--- a/src/test/ui/statics/static-methods-in-traits2.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-pub trait Number: NumConv {
-    fn from<T:Number>(n: T) -> Self;
-}
-
-impl Number for f64 {
-    fn from<T:Number>(n: T) -> f64 { n.to_float() }
-}
-
-pub trait NumConv {
-    fn to_float(&self) -> f64;
-}
-
-impl NumConv for f64 {
-    fn to_float(&self) -> f64 { *self }
-}
-
-pub fn main() {
-    let _: f64 = Number::from(0.0f64);
-}