From: Seiichi Uchida Date: Sat, 17 Mar 2018 16:08:02 +0000 (+0900) Subject: Update tests X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c9701d8e189ba97471062147e045e64bba783eb2;p=rust.git Update tests --- diff --git a/tests/source/macro_rules.rs b/tests/source/macro_rules.rs index ea3cefa8738..17bb3067869 100644 --- a/tests/source/macro_rules.rs +++ b/tests/source/macro_rules.rs @@ -1,5 +1,14 @@ // rustfmt-error_on_line_overflow: false +macro_rules! m { + () => (); + ( $ x : ident ) => (); + ( $ m1 : ident , $ m2 : ident , $ x : ident ) => (); + ( $($beginning:ident),*;$middle:ident;$($end:ident),* ) => (); + ( $($beginning: ident),*; $middle: ident; $($end: ident),*; $($beginning: ident),*; $middle: ident; $($end: ident),* ) => {}; + ( $ name : ident ( $ ( $ dol : tt $ var : ident ) * ) $ ( $ body : tt ) * ) => (); +} + macro_rules! m { // a ($expr :expr, $( $func : ident ) * ) => { @@ -88,12 +97,7 @@ fn foo() { // #2439 macro_rules! m { - ( - $line0_xxxxxxxxxxxxxxxxx: expr, - $line1_xxxxxxxxxxxxxxxxx: expr, - $line2_xxxxxxxxxxxxxxxxx: expr, - $line3_xxxxxxxxxxxxxxxxx: expr, - ) => {}; + ($line0_xxxxxxxxxxxxxxxxx: expr, $line1_xxxxxxxxxxxxxxxxx: expr, $line2_xxxxxxxxxxxxxxxxx: expr, $line3_xxxxxxxxxxxxxxxxx: expr,) => {}; } // #2466 diff --git a/tests/target/macro_rules.rs b/tests/target/macro_rules.rs index bc9c6aa4022..5bedc2a8258 100644 --- a/tests/target/macro_rules.rs +++ b/tests/target/macro_rules.rs @@ -1,5 +1,21 @@ // rustfmt-error_on_line_overflow: false +macro_rules! m { + () => {}; + ($x: ident) => {}; + ($m1: ident, $m2: ident, $x: ident) => {}; + ($($beginning: ident),*; $middle: ident; $($end: ident),*) => {}; + ( + $($beginning: ident),*; + $middle: ident; + $($end: ident),*; + $($beginning: ident),*; + $middle: ident; + $($end: ident),* + ) => {}; + ($name: ident($($dol: tt $var: ident)*) $($body: tt)*) => {}; +} + macro_rules! m { // a ($expr: expr, $($func: ident)*) => {{