Skip to content
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

Jump to bottom

Cleaner assert_eq! & assert_ne! panic messages #111071

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Cleaner assert_eq! & assert_ne! panic messages #111071

Show file tree
Hide file tree
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
14 changes: 6 additions & 8 deletions library/core/src/panicking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 267,14 @@ fn assert_failed_inner(

match args {
Some(args) => panic!(
r#"assertion failed: `(left {} right)`
left: `{:?}`,
right: `{:?}`: {}"#,
op, left, right, args
r#"assertion `left {op} right` failed: {args}
left: {left:?}
right: {right:?}"#
),
None => panic!(
r#"assertion failed: `(left {} right)`
left: `{:?}`,
right: `{:?}`"#,
op, left, right,
r#"assertion `left {op} right` failed
left: {left:?}
right: {right:?}"#
),
}
}
6 changes: 3 additions & 3 deletions tests/ui/macros/assert-eq-macro-msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
// run-fail
// error-pattern:assertion failed: `(left == right)`
// error-pattern: left: `2`
// error-pattern:right: `3`: 1 1 definitely should be 3
// error-pattern:assertion `left == right` failed: 1 1 definitely should be 3
// error-pattern: left: 2
// error-pattern: right: 3
// ignore-emscripten no processes

fn main() {
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/macros/assert-eq-macro-panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
// run-fail
// error-pattern:assertion failed: `(left == right)`
// error-pattern: left: `14`
// error-pattern:right: `15`
// error-pattern:assertion `left == right` failed
// error-pattern: left: 14
// error-pattern: right: 15
// ignore-emscripten no processes

fn main() {
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/macros/assert-matches-macro-msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
// run-fail
// error-pattern:assertion failed: `(left matches right)`
// error-pattern: left: `2`
// error-pattern:right: `3`: 1 1 definitely should be 3
// error-pattern:assertion `left matches right` failed: 1 1 definitely should be 3
// error-pattern: left: 2
// error-pattern: right: 3
// ignore-emscripten no processes

#![feature(assert_matches)]
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/macros/assert-ne-macro-msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
// run-fail
// error-pattern:assertion failed: `(left != right)`
// error-pattern: left: `2`
// error-pattern:right: `2`: 1 1 definitely should not be 2
// error-pattern:assertion `left != right` failed: 1 1 definitely should not be 2
// error-pattern: left: 2
// error-pattern: right: 2
// ignore-emscripten no processes

fn main() {
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/macros/assert-ne-macro-panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 1,7 @@
// run-fail
// error-pattern:assertion failed: `(left != right)`
// error-pattern: left: `14`
// error-pattern:right: `14`
// error-pattern:assertion `left != right` failed
// error-pattern: left: 14
// error-pattern: right: 14
// ignore-emscripten no processes

fn main() {
Expand Down
12 changes: 6 additions & 6 deletions tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 1,11 @@
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:33:5:
assertion failed: `(left == right)`
left: `2`,
right: `4`
assertion `left == right` failed
left: 2
right: 4
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:27:5:
assertion failed: `(left == right)`
left: `2`,
right: `4`
assertion `left == right` failed
left: 2
right: 4
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
testing321
6 changes: 3 additions & 3 deletions tests/ui/test-attrs/test-panic-abort.run.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 18,9 @@ testing123
---- it_fails stderr ----
testing321
thread 'main' panicked at $DIR/test-panic-abort.rs:38:5:
assertion failed: `(left == right)`
left: `2`,
right: `5`
assertion `left == right` failed
left: 2
right: 5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


Expand Down
Loading