Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 18 deletions

diff --git a/src/test/ui/rust-2018/try-macro.rs b/src/test/ui/rust-2018/try-macro.rs
deleted file mode 100644
index 69e87a1ff..000000000
--- a/src/test/ui/rust-2018/try-macro.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test that `try!` macros are rewritten.
-
-// run-rustfix
-// check-pass
-
-#![warn(rust_2018_compatibility)]
-#![allow(dead_code)]
-#![allow(deprecated)]
-
-fn foo() -> Result<usize, ()> {
-    let x: Result<usize, ()> = Ok(22);
-    try!(x);
-    //~^ WARNING `try` is a keyword in the 2018 edition
-    //~| WARNING this is accepted in the current edition
-    Ok(44)
-}
-
-fn main() {}