-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #12151 - J-ZhengLi:issue12131, r=Jarcho
fix [`dbg_macro`] FN when `dbg` is inside some complex macros fixes: #12131 It appears that [`root_macro_call_first_node`] only detects `println!` in the following example: ```rust println!("{:?}", dbg!(s)); ``` --- changelog: fix [`dbg_macro`] FN when `dbg` is inside some complex macros
- Loading branch information
Showing
9 changed files
with
344 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| //@compile-flags: --test | ||
| #![warn(clippy::dbg_macro)] | ||
| #![allow(clippy::unnecessary_operation, clippy::no_effect)] | ||
|
|
||
| fn foo(n: u32) -> u32 { | ||
| if let Some(n) = n.checked_sub(4) { n } else { n } | ||
| } | ||
|
|
||
| fn factorial(n: u32) -> u32 { | ||
| if n <= 1 { | ||
| 1 | ||
| } else { | ||
| n * factorial(n - 1) | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| 42; | ||
| foo(3) + factorial(4); | ||
| (1, 2, 3, 4, 5); | ||
| } | ||
|
|
||
| #[test] | ||
| pub fn issue8481() { | ||
| dbg!(1); | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| fn foo2() { | ||
| dbg!(1); | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod mod1 { | ||
| fn func() { | ||
| dbg!(1); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| #![warn(clippy::dbg_macro)] | ||
| #![allow(clippy::unnecessary_operation, clippy::no_effect)] | ||
|
|
||
| fn foo(n: u32) -> u32 { | ||
| if let Some(n) = n.checked_sub(4) { n } else { n } | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
| fn bar(_: ()) {} | ||
|
|
||
| fn factorial(n: u32) -> u32 { | ||
| if n <= 1 { | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| 1 | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } else { | ||
| n * factorial(n - 1) | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| 42; | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| foo(3) + factorial(4); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| (1, 2, 3, 4, 5); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
|
|
||
| fn issue9914() { | ||
| macro_rules! foo { | ||
| ($x:expr) => { | ||
| $x; | ||
| }; | ||
| } | ||
| macro_rules! foo2 { | ||
| ($x:expr) => { | ||
| $x; | ||
| }; | ||
| } | ||
| macro_rules! expand_to_dbg { | ||
| () => { | ||
|
|
||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| #[allow(clippy::let_unit_value)] | ||
| let _ = (); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| bar(()); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| foo!(()); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| foo2!(foo!(())); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| expand_to_dbg!(); | ||
| } | ||
|
|
||
| mod issue7274 { | ||
| trait Thing<'b> { | ||
| fn foo(&self); | ||
| } | ||
|
|
||
| macro_rules! define_thing { | ||
| ($thing:ident, $body:expr) => { | ||
| impl<'a> Thing<'a> for $thing { | ||
| fn foo<'b>(&self) { | ||
| $body | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| struct MyThing; | ||
| define_thing!(MyThing, { | ||
| 2; | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| }); | ||
| } | ||
|
|
||
| #[test] | ||
| pub fn issue8481() { | ||
| 1; | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| fn foo2() { | ||
| 1; | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod mod1 { | ||
| fn func() { | ||
| 1; | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
| } | ||
|
|
||
| mod issue12131 { | ||
| fn dbg_in_print(s: &str) { | ||
| println!("dbg: {:?}", s); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| print!("{}", s); | ||
| //~^ ERROR: the `dbg!` macro is intended as a debugging tool | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.