mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaner assert_eq! & assert_ne! panic messages

Browse Source 
Modify panic message for `assert_eq!`, `assert_ne!`, the currently unstable `assert_matches!`, as well as the corresponding `debug_assert_*` macros.

```rust
assert_eq!(1 + 1, 3);
assert_eq!(1 + 1, 3, "my custom message value={}!", 42);
```

```plain
thread 'main' panicked at $DIR/main.rs:6:5:
assertion failed: `(left == right)`
  left: `2`,
 right: `3`
```
```plain
thread 'main' panicked at $DIR/main.rs:6:5:
assertion failed: `(left == right)`
  left: `2`,
 right: `3`: my custom message value=42!
```

```plain
thread 'main' panicked at $DIR/main.rs:6:5:
assertion `left == right` failed
  left: 2
 right: 3
```

```plain
thread 'main' panicked at $DIR/main.rs:6:5:
assertion `left == right` failed: my custom message value=42!
  left: 2
 right: 3
```

This PR is a simpler subset of the #111030, but it does NOT stringify the original left and right source code assert expressions, thus should be faster to compile.
This commit is contained in:
Yuri Astrakhan 2023-05-01 12:34:42 -04:00
parent c57393e4f8
commit 950e3d9989
8 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/core/src/panicking.rs
View File

@ -267,16 +267,14 @@ fn assert_failed_inner(
match args { match args {
Some(args) => panic!( Some(args) => panic!(
r#"assertion failed: `(left {} right)` r#"assertion `left {op} right` failed: {args}
left: `{:?}`, left: {left:?}
right: `{:?}`: {}"#, right: {right:?}"#
op, left, right, args
), ),
None => panic!( None => panic!(
r#"assertion failed: `(left {} right)` r#"assertion `left {op} right` failed
left: `{:?}`, left: {left:?}
right: `{:?}`"#, right: {right:?}"#
op, left, right,
), ),
} }
} }

6
tests/ui/macros/assert-eq-macro-msg.rs
View File

@ -1,7 +1,7 @@
// run-fail // run-fail
// error-pattern:assertion failed: `(left == right)` // error-pattern:assertion `left == right` failed: 1 + 1 definitely should be 3
// error-pattern: left: `2` // error-pattern: left: 2
// error-pattern:right: `3`: 1 + 1 definitely should be 3 // error-pattern: right: 3
// ignore-emscripten no processes // ignore-emscripten no processes
fn main() { fn main() {

6
tests/ui/macros/assert-eq-macro-panic.rs
View File

@ -1,7 +1,7 @@
// run-fail // run-fail
// error-pattern:assertion failed: `(left == right)` // error-pattern:assertion `left == right` failed
// error-pattern: left: `14` // error-pattern: left: 14
// error-pattern:right: `15` // error-pattern: right: 15
// ignore-emscripten no processes // ignore-emscripten no processes
fn main() { fn main() {

6
tests/ui/macros/assert-matches-macro-msg.rs
View File

@ -1,7 +1,7 @@
// run-fail // run-fail
// error-pattern:assertion failed: `(left matches right)` // error-pattern:assertion `left matches right` failed: 1 + 1 definitely should be 3
// error-pattern: left: `2` // error-pattern: left: 2
// error-pattern:right: `3`: 1 + 1 definitely should be 3 // error-pattern: right: 3
// ignore-emscripten no processes // ignore-emscripten no processes
#![feature(assert_matches)] #![feature(assert_matches)]

6
tests/ui/macros/assert-ne-macro-msg.rs
View File

@ -1,7 +1,7 @@
// run-fail // run-fail
// error-pattern:assertion failed: `(left != right)` // error-pattern:assertion `left != right` failed: 1 + 1 definitely should not be 2
// error-pattern: left: `2` // error-pattern: left: 2
// error-pattern:right: `2`: 1 + 1 definitely should not be 2 // error-pattern: right: 2
// ignore-emscripten no processes // ignore-emscripten no processes
fn main() { fn main() {

6
tests/ui/macros/assert-ne-macro-panic.rs
View File

@ -1,7 +1,7 @@
// run-fail // run-fail
// error-pattern:assertion failed: `(left != right)` // error-pattern:assertion `left != right` failed
// error-pattern: left: `14` // error-pattern: left: 14
// error-pattern:right: `14` // error-pattern: right: 14
// ignore-emscripten no processes // ignore-emscripten no processes
fn main() { fn main() {

12
tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr
View File

@ -1,11 +1,11 @@
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:33:5: thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:33:5:
assertion failed: `(left == right)` assertion `left == right` failed
left: `2`, left: 2
right: `4` right: 4
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:27:5: thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:27:5:
assertion failed: `(left == right)` assertion `left == right` failed
left: `2`, left: 2
right: `4` right: 4
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
testing321 testing321

6
tests/ui/test-attrs/test-panic-abort.run.stdout
View File

@ -18,9 +18,9 @@ testing123
---- it_fails stderr ---- ---- it_fails stderr ----
testing321 testing321
thread 'main' panicked at $DIR/test-panic-abort.rs:38:5: thread 'main' panicked at $DIR/test-panic-abort.rs:38:5:
assertion failed: `(left == right)` assertion `left == right` failed
left: `2`, left: 2
right: `5` right: 5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace