Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 27 deletions

diff --git a/src/test/ui/macros/macro-in-expression-context.fixed b/src/test/ui/macros/macro-in-expression-context.fixed
deleted file mode 100644
index f22caf279..000000000
--- a/src/test/ui/macros/macro-in-expression-context.fixed
+++ /dev/null
@@ -1,27 +0,0 @@
-// run-rustfix
-
-macro_rules! foo {
-    () => {
-        assert_eq!("A", "A");
-        //~^ WARN trailing semicolon in macro
-        //~| WARN this was previously
-        //~| NOTE macro invocations at the end of a block
-        //~| NOTE to ignore the value produced by the macro
-        //~| NOTE for more information
-        //~| NOTE `#[warn(semicolon_in_expressions_from_macros)]` on by default
-        assert_eq!("B", "B");
-    }
-    //~^^ ERROR macro expansion ignores token `assert_eq` and any following
-    //~| NOTE the usage of `foo!` is likely invalid in expression context
-}
-
-fn main() {
-    foo!();
-    //~^ NOTE caused by the macro expansion here
-    //~| NOTE in this expansion
-    //~| NOTE in this expansion
-    //~| NOTE in this expansion
-    //~| NOTE in this expansion
-    //~| NOTE in this expansion
-    //~| NOTE in this expansion
-}