summaryrefslogtreecommitdiffstats
path: root/src/test/ui/lint/semicolon-in-expressions-from-macros
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/ui/lint/semicolon-in-expressions-from-macros')
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs4
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs9
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs51
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr48
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs16
-rw-r--r--src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr16
6 files changed, 0 insertions, 144 deletions
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs b/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
deleted file mode 100644
index 781391cc5..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[macro_export]
-macro_rules! my_macro {
- () => { true; }
-}
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs b/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
deleted file mode 100644
index 374506366..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// aux-build:foreign-crate.rs
-// check-pass
-
-extern crate foreign_crate;
-
-// Test that we do not lint for a macro in a foreign crate
-fn main() {
- let _ = foreign_crate::my_macro!();
-}
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);
-}
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr b/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
deleted file mode 100644
index 49608c205..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
+++ /dev/null
@@ -1,48 +0,0 @@
-warning: trailing semicolon in macro used in expression position
- --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
- |
-LL | true;
- | ^
-...
-LL | foo!(warn_in_block)
- | ------------------- in this macro invocation
- |
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
- = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
- = note: macro invocations at the end of a block are treated as expressions
- = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
-note: the lint level is defined here
- --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
- |
-LL | #![warn(semicolon_in_expressions_from_macros)]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: trailing semicolon in macro used in expression position
- --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
- |
-LL | true;
- | ^
-...
-LL | let _ = foo!(warn_in_expr);
- | ------------------ in this macro invocation
- |
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
- = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
- = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: trailing semicolon in macro used in expression position
- --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
- |
-LL | true;
- | ^
-...
-LL | let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
- | ------------------------- in this macro invocation
- |
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
- = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
- = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: 3 warnings emitted
-
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs b/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
deleted file mode 100644
index 2c63311e6..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// check-pass
-// Ensure that trailing semicolons cause warnings by default
-
-macro_rules! foo {
- () => {
- true; //~ WARN trailing semicolon in macro
- //~| WARN this was previously
- }
-}
-
-fn main() {
- let _val = match true {
- true => false,
- _ => foo!()
- };
-}
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr b/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
deleted file mode 100644
index 16c152eb2..000000000
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-warning: trailing semicolon in macro used in expression position
- --> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
- |
-LL | true;
- | ^
-...
-LL | _ => foo!()
- | ------ in this macro invocation
- |
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
- = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
- = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
- = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: 1 warning emitted
-