Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 47 deletions

diff --git a/src/test/ui/suggestions/constrain-trait.fixed b/src/test/ui/suggestions/constrain-trait.fixed
deleted file mode 100644
index f292f27f0..000000000
--- a/src/test/ui/suggestions/constrain-trait.fixed
+++ /dev/null
@@ -1,47 +0,0 @@
-// run-rustfix
-// check-only
-
-#[derive(Debug)]
-struct Demo {
-    a: String
-}
-
-trait GetString {
-    fn get_a(&self) -> &String;
-}
-
-trait UseString: std::fmt::Debug + GetString {
-    fn use_string(&self) {
-        println!("{:?}", self.get_a()); //~ ERROR no method named `get_a` found
-    }
-}
-
-trait UseString2: GetString {
-    fn use_string(&self) {
-        println!("{:?}", self.get_a()); //~ ERROR no method named `get_a` found
-    }
-}
-
-impl GetString for Demo {
-    fn get_a(&self) -> &String {
-        &self.a
-    }
-}
-
-impl UseString for Demo {}
-impl UseString2 for Demo {}
-
-
-#[cfg(test)]
-mod tests {
-    use crate::{Demo, UseString};
-
-    #[test]
-    fn it_works() {
-        let d = Demo { a: "test".to_string() };
-        d.use_string();
-    }
-}
-
-
-fn main() {}