Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 51 deletions

diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs b/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
deleted file mode 100644
index fff380934..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// check-pass
-// edition:2018
-#![feature(stmt_expr_attributes)]
-#![warn(semicolon_in_expressions_from_macros)]
-
-#[allow(dead_code)]
-macro_rules! foo {
-    ($val:ident) => {
-        true; //~  WARN trailing semicolon in macro
-              //~| WARN this was previously accepted
-              //~| WARN trailing semicolon in macro
-              //~| WARN this was previously accepted
-              //~| WARN trailing semicolon in macro
-              //~| WARN this was previously accepted
-    }
-}
-
-#[allow(semicolon_in_expressions_from_macros)]
-async fn bar() {
-    foo!(first);
-}
-
-fn main() {
-    #[allow(semicolon_in_expressions_from_macros)]
-    let _ = {
-        foo!(first)
-    };
-
-    #[allow(semicolon_in_expressions_from_macros)]
-    let _ = foo!(second);
-
-    #[allow(semicolon_in_expressions_from_macros)]
-    fn inner() {
-        let _ = foo!(third);
-    }
-
-    #[allow(semicolon_in_expressions_from_macros)]
-    async {
-        let _ = foo!(fourth);
-    };
-
-    let _ = {
-        foo!(warn_in_block)
-    };
-
-    let _ = foo!(warn_in_expr);
-
-    // This `#[allow]` does not work, since the attribute gets dropped
-    // when we expand the macro
-    let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
-}