Skip to content

Update ensure tests to nightly-2021-12-06 and run on nightly only #208

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

Merged
merged 2 commits into from
Dec 6, 2021
Merged

Update ensure tests to nightly-2021-12-06 and run on nightly only #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
376518b
Update ensure tests to nightly-2021-12-06 and run on nightly only
dtolnay Dec 6, 2021
58380ac
Bypass error message comparison during miri test as well
dtolnay Dec 6, 2021
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ backtrace = { version = "0.3.51", optional = true }

[dev-dependencies]
futures = { version = "0.3", default-features = false }
rustversion = "1.0"
rustversion = "1.0.6"
syn = { version = "1.0", features = ["full"] }
thiserror = "1.0"
trybuild = { version = "1.0.49", features = ["diff"] }
Expand Down
52 changes: 25 additions & 27 deletions tests/test_ensure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@ impl<T> Trait for T {}
fn assert_err<T: Debug>(result: impl FnOnce() -> Result<T>, expected: &'static str) {
let actual = result().unwrap_err().to_string();

let mut accepted_alternatives = expected.split('\n');
let expected = accepted_alternatives.next_back().unwrap();
if accepted_alternatives.any(|alternative| actual == alternative) {
return;
// In general different rustc versions will format the interpolated lhs and
// rhs $:expr fragment with insignificant differences in whitespace or
// punctuation, so we check the message in full against nightly and do just
// a cursory test on older toolchains.
if rustversion::cfg!(nightly) && !cfg!(miri) {
assert_eq!(actual, expected);
} else {
assert_eq!(actual.contains(" vs "), expected.contains(" vs "));
}

assert_eq!(actual, expected);
}

#[test]
Expand Down Expand Up @@ -98,7 +100,7 @@ fn test_low_precedence_binary_operator() {
let test = || Ok(ensure!(while false == true && false {} < ()));
assert_err(
test,
"Condition failed: `while false == true && false { } < ()` (() vs ())",
"Condition failed: `while false == true && false {} < ()` (() vs ())",
);
}

Expand Down Expand Up @@ -145,41 +147,41 @@ fn test_unary() {
fn test_if() {
#[rustfmt::skip]
let test = || Ok(ensure!(if false {}.t(1) == 2));
assert_err(test, "Condition failed: `if false { }.t(1) == 2` (1 vs 2)");
assert_err(test, "Condition failed: `if false {}.t(1) == 2` (1 vs 2)");

#[rustfmt::skip]
let test = || Ok(ensure!(if false {} else {}.t(1) == 2));
assert_err(
test,
"Condition failed: `if false { } else { }.t(1) == 2` (1 vs 2)",
"Condition failed: `if false {} else {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(if false {} else if false {}.t(1) == 2));
assert_err(
test,
"Condition failed: `if false { } else if false { }.t(1) == 2` (1 vs 2)",
"Condition failed: `if false {} else if false {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(if let 1 = 2 {}.t(1) == 2));
assert_err(
test,
"Condition failed: `if let 1 = 2 { }.t(1) == 2` (1 vs 2)",
"Condition failed: `if let 1 = 2 {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(if let 1 | 2 = 2 {}.t(1) == 2));
assert_err(
test,
"Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
"Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2));
assert_err(
test,
"Condition failed: `if let 1 | 2 = 2 { }.t(1) == 2` (1 vs 2)",
"Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)",
);
}

Expand All @@ -189,53 +191,49 @@ fn test_loop() {
let test = || Ok(ensure!(1 + loop { break 1 } == 1));
assert_err(
test,
// 1.54 puts a double space after loop
"Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)\n\
Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
"Condition failed: `1 + loop { break 1 } == 1` (2 vs 1)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(1 + 'a: loop { break 'a 1 } == 1));
assert_err(
test,
// 1.54 puts a double space after loop
"Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)\n\
Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
"Condition failed: `1 + 'a: loop { break 'a 1 } == 1` (2 vs 1)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(while false {}.t(1) == 2));
assert_err(
test,
"Condition failed: `while false { }.t(1) == 2` (1 vs 2)",
"Condition failed: `while false {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(while let None = Some(1) {}.t(1) == 2));
assert_err(
test,
"Condition failed: `while let None = Some(1) { }.t(1) == 2` (1 vs 2)",
"Condition failed: `while let None = Some(1) {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(for _x in iter::once(0) {}.t(1) == 2));
assert_err(
test,
"Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
"Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2));
assert_err(
test,
"Condition failed: `for _x in iter::once(0) { }.t(1) == 2` (1 vs 2)",
"Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)",
);

#[rustfmt::skip]
let test = || Ok(ensure!(for true | false in iter::empty() {}.t(1) == 2));
assert_err(
test,
"Condition failed: `for true | false in iter::empty() { }.t(1) == 2` (1 vs 2)",
"Condition failed: `for true | false in iter::empty() {}.t(1) == 2` (1 vs 2)",
);
}

Expand Down Expand Up @@ -381,7 +379,7 @@ fn test_macro() {
let test = || Ok(ensure!(stringify! {} != ""));
assert_err(
test,
"Condition failed: `stringify! { } != \"\"` (\"\" vs \"\")",
"Condition failed: `stringify! {} != \"\"` (\"\" vs \"\")",
);
}

Expand Down Expand Up @@ -663,7 +661,7 @@ fn test_pat() {
let test = || Ok(ensure!(if let ::std::marker::PhantomData = p {} != ()));
assert_err(
test,
"Condition failed: `if let ::std::marker::PhantomData = p { } != ()` (() vs ())",
"Condition failed: `if let ::std::marker::PhantomData = p {} != ()` (() vs ())",
);

let test = || Ok(ensure!(if let <S as Trait>::V = 0 { 0 } else { 1 } == 1));
Expand All @@ -675,7 +673,7 @@ fn test_pat() {
let test = || Ok(ensure!(for _ in iter::once(()) {} != ()));
assert_err(
test,
"Condition failed: `for _ in iter::once(()) { } != ()` (() vs ())",
"Condition failed: `for _ in iter::once(()) {} != ()` (() vs ())",
);

let test = || Ok(ensure!(if let stringify!(x) = "x" { 0 } else { 1 } == 1));
Expand Down