Skip to content

Rollup of 11 pull requests #140503

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.

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 28 commits into from
Apr 30, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0ce0251
uses_power_alignment: wording tweaks
RalfJung Mar 28, 2025
87ff60c
check_struct_for_power_alignment: simplify code
RalfJung Apr 1, 2025
55a419f
Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`
ShE3py Apr 28, 2025
5b1e495
Add a few extra tests to `tests/ui/macros/stringify.rs`.
nnethercote Apr 23, 2025
99f6b63
Improve pretty-printing of braces.
nnethercote May 17, 2024
cf12e29
enable msa feature for mips in codegen tests
koalatux Apr 29, 2025
4fe94ba
add `rust.debug-assertions-tools` option
pietroalbini Apr 29, 2025
2393e44
miri: algebraic intrinsics: bring back float non-determinism
RalfJung Apr 29, 2025
478b378
Move `on impl position` test to proper directory
mejrs Apr 29, 2025
fc2cd77
Fix comment describing what the test does
mejrs Apr 29, 2025
923ca85
Add test
oli-obk Apr 29, 2025
a1c7059
Treat `ManuallyDrop` as `~const Destruct`
oli-obk Apr 29, 2025
a4ce307
Coalesce duplicate missing clone tests
mejrs Apr 29, 2025
64bcf3b
Rename `rustc_query_append!` to `rustc_with_all_queries!`
Zalathar Apr 29, 2025
ed2f4b6
Reformat parameters to macros used by with-all-queries
Zalathar Apr 29, 2025
851decd
mention provenance in the pointer::wrapping_offset docs
lolbinarycat Mar 31, 2025
7275462
canonical no type foldable :<
lcnr Apr 28, 2025
bd3e447
Rollup merge of #136160 - ShE3py:should-panic-backticks, r=thomcc
matthiaskrgr Apr 30, 2025
e897144
Rollup merge of #139059 - RalfJung:uses_power_alignment, r=nagisa
matthiaskrgr Apr 30, 2025
aeec053
Rollup merge of #139192 - lolbinarycat:docs-wrapping_offset-provenanc…
matthiaskrgr Apr 30, 2025
56e01fe
Rollup merge of #140312 - nnethercote:DelimArgs-spacing, r=petrochenkov
matthiaskrgr Apr 30, 2025
b1a1c67
Rollup merge of #140404 - lcnr:canonical-no-type-foldable, r=compiler…
matthiaskrgr Apr 30, 2025
bb03780
Rollup merge of #140437 - husqvarnagroup:af/codegen-test-mips-msa, r=…
matthiaskrgr Apr 30, 2025
1267f0c
Rollup merge of #140438 - ferrocene:pa-debug-assertions-tools, r=Kobzol
matthiaskrgr Apr 30, 2025
254f050
Rollup merge of #140439 - RalfJung:miri-algebraic-float-nondet, r=oli…
matthiaskrgr Apr 30, 2025
9625096
Rollup merge of #140445 - oli-obk:const-manually-drop, r=fee1-dead
matthiaskrgr Apr 30, 2025
89ad574
Rollup merge of #140446 - mejrs:test1, r=jieyouxu
matthiaskrgr Apr 30, 2025
ae7d78a
Rollup merge of #140448 - Zalathar:query-append, r=compiler-errors
matthiaskrgr Apr 30, 2025
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
Prev Previous commit
Next Next commit
Remove backticks from ShouldPanic::YesWithMessage's TrFailedMsg
  • Loading branch information
ShE3py committed Apr 28, 2025
commit 55a419f444378afb5eceb361959fa57eefce2be1
9 changes: 4 additions & 5 deletions library/test/src/test_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,15 @@ pub(crate) fn calc_result(
} else if let Some(panic_str) = maybe_panic_str {
TestResult::TrFailedMsg(format!(
r#"panic did not contain expected string
panic message: `{panic_str:?}`,
expected substring: `{msg:?}`"#
panic message: {panic_str:?}
expected substring: {msg:?}"#
))
} else {
TestResult::TrFailedMsg(format!(
r#"expected panic with string value,
found non-string value: `{:?}`
expected substring: `{:?}`"#,
(*err).type_id(),
msg
expected substring: {msg:?}"#,
(*err).type_id()
))
}
}
Expand Down
6 changes: 3 additions & 3 deletions library/test/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ fn test_should_panic_bad_message() {
}
let expected = "foobar";
let failed_msg = r#"panic did not contain expected string
panic message: `"an error message"`,
expected substring: `"foobar"`"#;
panic message: "an error message"
expected substring: "foobar""#;
let desc = TestDescAndFn {
desc: TestDesc {
name: StaticTestName("whatever"),
Expand Down Expand Up @@ -238,7 +238,7 @@ fn test_should_panic_non_string_message_type() {
let failed_msg = format!(
r#"expected panic with string value,
found non-string value: `{:?}`
expected substring: `"foobar"`"#,
expected substring: "foobar""#,
TypeId::of::<i32>()
);
let desc = TestDescAndFn {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ note: test did not panic as expected at $DIR/test-should-panic-failed-show-span.
note: test did not panic as expected at $DIR/test-should-panic-failed-show-span.rs:31:4
---- should_panic_with_substring_panics_with_incorrect_string stdout ----
note: panic did not contain expected string
panic message: `"ZOMGWTFBBQ"`,
expected substring: `"message"`
panic message: "ZOMGWTFBBQ"
expected substring: "message"
---- should_panic_with_substring_panics_with_non_string_value stdout ----
note: expected panic with string value,
found non-string value: `TypeId($HEX)`
expected substring: `"message"`
expected substring: "message"

failures:
should_panic_with_any_message_does_not_panic
Expand Down
Loading