Skip to content

Permit trailing commas in macro invocations #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
myrrlyn wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −13
Open

Permit trailing commas in macro invocations #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 42 additions & 13 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/// assert_matches!(a, Foo::A(i) if i > 0);
///
/// let b = Foo::B("foobar");
///
///
/// // Assert that `b` matches the pattern `Foo::B(_)`.
/// assert_matches!(b, Foo::B(s) => {
/// // Perform additional assertions on the variable binding `s`.
Expand All @@ -60,60 +60,60 @@
/// ```
#[macro_export]
macro_rules! assert_matches {
( $e:expr , $pat:pat ) => {
( $e:expr , $pat:pat $(,)? ) => {
match $e {
$pat => (),
ref e => panic!("assertion failed: `{:?}` does not match `{}`",
e, stringify!($pat))
}
};
( $e:expr , $pat:pat if $cond:expr ) => {
( $e:expr , $pat:pat if $cond:expr $(,)? ) => {
match $e {
$pat if $cond => (),
ref e => panic!("assertion failed: `{:?}` does not match `{}`",
e, stringify!($pat if $cond))
}
};
( $e:expr , $pat:pat => $arm:expr ) => {
( $e:expr , $pat:pat => $arm:expr $(,)? ) => {
match $e {
$pat => $arm,
ref e => panic!("assertion failed: `{:?}` does not match `{}`",
e, stringify!($pat))
}
};
( $e:expr , $pat:pat if $cond:expr => $arm:expr ) => {
( $e:expr , $pat:pat if $cond:expr => $arm:expr $(,)? ) => {
match $e {
$pat if $cond => $arm,
ref e => panic!("assertion failed: `{:?}` does not match `{}`",
e, stringify!($pat if $cond))
}
};
( $e:expr , $pat:pat , $($arg:tt)* ) => {
( $e:expr , $pat:pat , $($arg:tt)+ ) => {
match $e {
$pat => (),
ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
e, stringify!($pat), format_args!($($arg)*))
e, stringify!($pat), format_args!($($arg)+))
}
};
( $e:expr , $pat:pat if $cond:expr , $($arg:tt)* ) => {
( $e:expr , $pat:pat if $cond:expr , $($arg:tt)+ ) => {
match $e {
$pat if $cond => (),
ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
e, stringify!($pat if $cond), format_args!($($arg)*))
e, stringify!($pat if $cond), format_args!($($arg)+))
}
};
( $e:expr , $pat:pat => $arm:expr , $($arg:tt)* ) => {
( $e:expr , $pat:pat => $arm:expr , $($arg:tt)+ ) => {
match $e {
$pat => $arm,
ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
e, stringify!($pat), format_args!($($arg)*))
e, stringify!($pat), format_args!($($arg)+))
}
};
( $e:expr , $pat:pat if $cond:expr => $arm:expr , $($arg:tt)* ) => {
( $e:expr , $pat:pat if $cond:expr => $arm:expr , $($arg:tt)+ ) => {
match $e {
$pat if $cond => $arm,
ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
e, stringify!($pat if $cond), format_args!($($arg)*))
e, stringify!($pat if $cond), format_args!($($arg)+))
}
};
}
Expand Down Expand Up @@ -302,4 +302,33 @@ mod test {
assert_matches!(a, Foo::B(s) if s == "foo" => {}, "msg");
}), r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`: msg"#);
}

#[test]
fn trailing_commas() {
let a = Foo::A(123);

assert_matches!(a, Foo::A(..));
assert_matches!(a, Foo::A(..),);

assert_matches!(a, Foo::A(val) if val >= 100);
assert_matches!(a, Foo::A(val) if val >= 100,);

assert_matches!(a, Foo::A(val) => assert!(val >= 100));
assert_matches!(a, Foo::A(val) => assert!(val >= 100),);

assert_matches!(a, Foo::A(val) if val >= 100 => assert!(val < 200));
assert_matches!(a, Foo::A(val) if val >= 100 => assert!(val < 200),);

assert_matches!(a, Foo::A(..), "error message");
assert_matches!(a, Foo::A(..), "error message",);

assert_matches!(a, Foo::A(val) if val >= 100, "error message");
assert_matches!(a, Foo::A(val) if val >= 100, "error message",);

assert_matches!(a, Foo::A(val) => assert!(val >= 100), "error message");
assert_matches!(a, Foo::A(val) => assert!(val >= 100), "error message",);

assert_matches!(a, Foo::A(val) if val >= 100 => assert!(val < 200), "error message");
assert_matches!(a, Foo::A(val) if val >= 100 => assert!(val < 200), "error message",);
}
}