From aac7f91cbf258afd317aec2dc163d649119136df Mon Sep 17 00:00:00 2001 From: Ayaz Hafiz Date: Tue, 19 May 2020 08:10:44 -0700 Subject: [PATCH 1/3] Add test cases for fixed issues The cases with `hard_tabs: true` were fixed in 2836f9bd84a3f8bed96dc6aaa5e8cfd219171245. Not sure about the rest, but this suggests a number of open issues are already resolved. Closes #3608 Closes #3550 Closes #3638 Closes #3858 Closes #3936 --- .../rustfmt-lib/tests/target/issue-3068.rs | 15 +++++++ .../rustfmt-lib/tests/target/issue-3550.rs | 39 +++++++++++++++++++ .../rustfmt-lib/tests/target/issue-3638.rs | 19 +++++++++ .../rustfmt-lib/tests/target/issue-3858.rs | 12 ++++++ .../rustfmt-lib/tests/target/issue-3936.rs | 9 +++++ 5 files changed, 94 insertions(+) create mode 100644 rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs create mode 100644 rustfmt-core/rustfmt-lib/tests/target/issue-3550.rs create mode 100644 rustfmt-core/rustfmt-lib/tests/target/issue-3638.rs create mode 100644 rustfmt-core/rustfmt-lib/tests/target/issue-3858.rs create mode 100644 rustfmt-core/rustfmt-lib/tests/target/issue-3936.rs diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs new file mode 100644 index 00000000000..35ad223aaa6 --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs @@ -0,0 +1,15 @@ +// rustfmt-hard_tabs: true + +macro_rules! foo { + ($bar: expr, $t: ty) => { + $bar(|x| { + if x { + None; + None + } else { + None; + None + } + }) + }; +} diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3550.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3550.rs new file mode 100644 index 00000000000..49fd8423cad --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3550.rs @@ -0,0 +1,39 @@ +fn main() { + assert( + long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long(), + ); + + assert!( + long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long(), + ); +} diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3638.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3638.rs new file mode 100644 index 00000000000..8f63f10213d --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3638.rs @@ -0,0 +1,19 @@ +macro_rules! abait { + ($x:expr) => { + Ok(()) + }; +} + +mod a { + fn foo() -> Result<(), ()> { + unsafe { + ( + abait!( + proxy.load_account(ahc_client_end, TEST_ACCOUNT_ID.clone().as_mut().into()) + )?, + (), + ) + }; + Ok(()) + } +} diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3858.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3858.rs new file mode 100644 index 00000000000..d06a615b160 --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3858.rs @@ -0,0 +1,12 @@ +// rustfmt-hard_tabs: true + +macro_rules! member_mut { + ($self:expr, $member:expr) => {{ + use self::Member::*; + let r = &mut *$self; + match $member { + A => &mut r.a, + B => &mut r.b, + } + }}; +} diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3936.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3936.rs new file mode 100644 index 00000000000..88e73e12154 --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3936.rs @@ -0,0 +1,9 @@ +// rustfmt-hard_tabs: true + +macro_rules! m { + ($a:expr) => { + if $a { + return; + } + }; +} From 705b9fb269a16f748fb9ea268e81d7626e78b9f4 Mon Sep 17 00:00:00 2001 From: Ayaz Hafiz Date: Wed, 20 May 2020 10:39:47 -0700 Subject: [PATCH 2/3] fixup! Add test cases for fixed issues --- .../rustfmt-lib/tests/source/issue-3550.rs | 37 +++++++++++++++++++ .../rustfmt-lib/tests/target/issue-3068.rs | 2 - 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 rustfmt-core/rustfmt-lib/tests/source/issue-3550.rs diff --git a/rustfmt-core/rustfmt-lib/tests/source/issue-3550.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3550.rs new file mode 100644 index 00000000000..b6a34c06684 --- /dev/null +++ b/rustfmt-core/rustfmt-lib/tests/source/issue-3550.rs @@ -0,0 +1,37 @@ +fn main() { + assert(long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long(), + ); + + assert!(long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long() + .long(),); +} + diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs index 35ad223aaa6..8f0b58ccf01 100644 --- a/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs @@ -5,10 +5,8 @@ macro_rules! foo { $bar(|x| { if x { None; - None } else { None; - None } }) }; From e25e91f9cb0523a2dbf710c17b6902d8ddfdb36e Mon Sep 17 00:00:00 2001 From: Ayaz Hafiz Date: Wed, 20 May 2020 18:33:24 -0700 Subject: [PATCH 3/3] fixup! Add test cases for fixed issues --- rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs index 8f0b58ccf01..198d6385e6e 100644 --- a/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs +++ b/rustfmt-core/rustfmt-lib/tests/target/issue-3068.rs @@ -1,12 +1,13 @@ // rustfmt-hard_tabs: true +// rustfmt-single_line_if_else_max_width: 10 macro_rules! foo { ($bar: expr, $t: ty) => { $bar(|x| { if x { - None; + None } else { - None; + None } }) };