Skip to content

Format code using 'cargo fmt' #7

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
Atul9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Format code using 'cargo fmt' #7

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
83 changes: 54 additions & 29 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 Down Expand Up @@ -242,17 +242,18 @@ mod test {
assert_matches!(a, Foo::A(n) if n == 0, "o noes {:?}", a);
assert_matches!(a, Foo::A(n) => assert_eq!(n, 0), "o noes {:?}", a);
assert_matches!(a, Foo::A(n) => { assert_eq!(n, 0); assert!(n < 1) }, "o noes {:?}", a);
assert_matches!(a, Foo::A(_), "o noes {value:?}", value=a);
assert_matches!(a, Foo::A(_), "o noes {value:?}", value = a);
assert_matches!(a, Foo::A(n) if n == 0, "o noes {value:?}", value=a);
assert_matches!(a, Foo::A(n) => assert_eq!(n, 0), "o noes {value:?}", value=a);
assert_matches!(a, Foo::A(n) => { assert_eq!(n, 0); assert!(n < 1) }, "o noes {value:?}", value=a);
assert_matches!(a, Foo::A(n) if n == 0 => assert_eq!(n, 0), "o noes {value:?}", value=a);
}

fn panic_message<F>(f: F) -> String
where F: FnOnce() + UnwindSafe {
let err = catch_unwind(f)
.expect_err("function did not panic");
where
F: FnOnce() + UnwindSafe,
{
let err = catch_unwind(f).expect_err("function did not panic");

*err.downcast::<String>()
.expect("function panicked with non-String value")
Expand All @@ -263,43 +264,67 @@ mod test {
let a = Foo::A(1);

// expr, pat
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(_));
}), r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(_));
}),
r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#
);

// expr, pat if cond
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(s) if s == "foo");
}), r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(s) if s == "foo");
}),
r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#
);

// expr, pat => arm
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(_) => {});
}), r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(_) => {});
}),
r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#
);

// expr, pat if cond => arm
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(s) if s == "foo" => {});
}), r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(s) if s == "foo" => {});
}),
r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#
);

// expr, pat, args
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(_), "msg");
}), r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(_), "msg");
}),
r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#
);

// expr, pat if cond, args
assert_eq!(panic_message(|| {
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"#);
assert_eq!(
panic_message(|| {
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"#
);

// expr, pat => arm, args
assert_eq!(panic_message(|| {
assert_matches!(a, Foo::B(_) => {}, "msg");
}), r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#);
assert_eq!(
panic_message(|| {
assert_matches!(a, Foo::B(_) => {}, "msg");
}),
r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#
);

// expr, pat if cond => arm, args
assert_eq!(panic_message(|| {
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"#);
assert_eq!(
panic_message(|| {
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"#
);
}
}