diff options
| author | bors <bors@rust-lang.org> | 2020-11-23 22:05:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-23 22:05:28 +0000 |
| commit | d5b40bf469aa1f5d1e26e956a02ad70cb7d4358e (patch) | |
| tree | db4836e1a7df4139b028fb1872a03d24c3fe5af8 | |
| parent | e5fddb6747dae0e01392e1cd47baba9e0587c8e7 (diff) | |
| parent | d708b444e4dc324369ba7ee2235451399f828321 (diff) | |
| download | rust-d5b40bf469aa1f5d1e26e956a02ad70cb7d4358e.tar.gz rust-d5b40bf469aa1f5d1e26e956a02ad70cb7d4358e.zip | |
Auto merge of #78343 - camelid:macros-qualify-panic, r=m-ou-se
Qualify `panic!` as `core::panic!` in non-built-in `core` macros
Fixes #78333.
-----
Otherwise code like this
#![no_implicit_prelude]
fn main() {
::std::todo!();
::std::unimplemented!();
}
will fail to compile, which is unfortunate and presumably unintended.
This changes many invocations of `panic!` in a `macro_rules!` definition
to invocations of `$crate::panic!`, which makes the invocations hygienic.
Note that this does not make the built-in macro `assert!` hygienic.
| -rw-r--r-- | tests/ui/logic_bug.rs | 2 | ||||
| -rw-r--r-- | tests/ui/nonminimal_bool.rs | 2 | ||||
| -rw-r--r-- | tests/ui/nonminimal_bool_methods.rs | 2 | ||||
| -rw-r--r-- | tests/ui/wildcard_enum_match_arm.fixed | 2 | ||||
| -rw-r--r-- | tests/ui/wildcard_enum_match_arm.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/ui/logic_bug.rs b/tests/ui/logic_bug.rs index b4163d776e7..a01c6ef99db 100644 --- a/tests/ui/logic_bug.rs +++ b/tests/ui/logic_bug.rs @@ -1,4 +1,4 @@ -#![allow(unused, clippy::many_single_char_names)] +#![allow(unused, clippy::many_single_char_names, clippy::diverging_sub_expression)] #![warn(clippy::logic_bug)] fn main() { diff --git a/tests/ui/nonminimal_bool.rs b/tests/ui/nonminimal_bool.rs index 7ea154cb9b0..971be26278f 100644 --- a/tests/ui/nonminimal_bool.rs +++ b/tests/ui/nonminimal_bool.rs @@ -1,4 +1,4 @@ -#![allow(unused, clippy::many_single_char_names)] +#![allow(unused, clippy::many_single_char_names, clippy::diverging_sub_expression)] #![warn(clippy::nonminimal_bool)] fn main() { diff --git a/tests/ui/nonminimal_bool_methods.rs b/tests/ui/nonminimal_bool_methods.rs index 4de48cd0879..90758740290 100644 --- a/tests/ui/nonminimal_bool_methods.rs +++ b/tests/ui/nonminimal_bool_methods.rs @@ -1,4 +1,4 @@ -#![allow(unused, clippy::many_single_char_names)] +#![allow(unused, clippy::many_single_char_names, clippy::diverging_sub_expression)] #![warn(clippy::nonminimal_bool)] fn methods_with_negation() { diff --git a/tests/ui/wildcard_enum_match_arm.fixed b/tests/ui/wildcard_enum_match_arm.fixed index 4f8754a9301..b1e5742b785 100644 --- a/tests/ui/wildcard_enum_match_arm.fixed +++ b/tests/ui/wildcard_enum_match_arm.fixed @@ -7,7 +7,7 @@ dead_code, clippy::single_match, clippy::wildcard_in_or_patterns, - clippy::unnested_or_patterns + clippy::unnested_or_patterns, clippy::diverging_sub_expression )] use std::io::ErrorKind; diff --git a/tests/ui/wildcard_enum_match_arm.rs b/tests/ui/wildcard_enum_match_arm.rs index 5e66644ceca..cd3ec3ea8d2 100644 --- a/tests/ui/wildcard_enum_match_arm.rs +++ b/tests/ui/wildcard_enum_match_arm.rs @@ -7,7 +7,7 @@ dead_code, clippy::single_match, clippy::wildcard_in_or_patterns, - clippy::unnested_or_patterns + clippy::unnested_or_patterns, clippy::diverging_sub_expression )] use std::io::ErrorKind; |