Skip to content

Rollup of 7 pull requests #111089

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 39 commits into from
May 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
05c1e6b
stabilize debugger visualizer attribute
gibbyfree Mar 2, 2023
5c34f77
whitespace, delete unstable book page
gibbyfree Mar 2, 2023
4510439
Refactor core::char::EscapeDefault and co. structures
mina86 Nov 29, 2022
be413ae
Remove all in target_thread_local cfg
Ayush1325 Apr 27, 2023
518d348
Implement `StructuralEq` for integers, `bool` and `char`
WaffleLapkin Feb 17, 2023
9a716da
Add a `ConstParamTy` trait
WaffleLapkin Feb 17, 2023
c8844e1
`derive(Eq)` in a test
WaffleLapkin Feb 22, 2023
81a2b85
Remove `feature(const_param_ty_trait)`, use `adt_const_params` instead
WaffleLapkin Feb 22, 2023
c45c4f2
Rename/move a test
WaffleLapkin Feb 22, 2023
1c54410
Check the correct trait when checking `ConstParamTy` impls
WaffleLapkin Feb 23, 2023
7234d63
Add `!StructuralEq` test for `ConstParamTy`
WaffleLapkin Feb 23, 2023
2205c3f
Add a macro to conveniently implement marker traits
WaffleLapkin Mar 3, 2023
1bf6bbb
Impl `StructuralEq` & `ConstParamTy` for `str`, `&T`, `[T; N]` and `[T]`
WaffleLapkin Mar 3, 2023
2c5e716
Add FIXMEs
WaffleLapkin Mar 3, 2023
51355ad
Add a test for `[NotParam; 0]: ConstParamTy` (not holding)
WaffleLapkin Mar 3, 2023
bdb5502
Fix some marker impls
WaffleLapkin Mar 3, 2023
26417a8
Add `ConstParamTy` tests
WaffleLapkin Mar 3, 2023
2f70d02
Fix compile test so it normalizes (un)expected error messages
WaffleLapkin Apr 27, 2023
1f44a24
--bless `ConstParamTy` ui tests
WaffleLapkin Apr 27, 2023
182eee2
fixup tests wrt new normalization
WaffleLapkin Apr 28, 2023
5c99175
uplift `clippy::clone_double_ref` as `suspicious_double_ref_op`
fee1-dead Apr 28, 2023
e928067
fix rustdoc and core test
fee1-dead Apr 29, 2023
475378f
add match to diagnostic messages
fee1-dead Apr 29, 2023
4d0f7e2
review
mina86 Apr 30, 2023
76c9947
a bit more usize::from
mina86 Apr 30, 2023
c317546
Fix `StructuralEq` impls for `&T`, `[T]` and `[T; N]`
WaffleLapkin May 1, 2023
0bcfff4
Simplify type_parameter_bounds_in_generics
compiler-errors Apr 18, 2023
8ea71f2
Do not consider associated type bounds for super_predicates_that_defi…
compiler-errors Apr 18, 2023
bec7193
Don't use implied trait predicates in gather_explicit_predicates_of
compiler-errors Apr 19, 2023
b00e5f3
remove bootstrap from tests
gibbyfree Mar 6, 2023
c9653a6
fix stderrs
gibbyfree Mar 6, 2023
7411468
Mark RPITIT and AFIT as no longer incomplete
compiler-errors May 1, 2023
f916c44
Rollup merge of #105076 - mina86:a, r=scottmcm
Dylan-DPC May 2, 2023
b727132
Rollup merge of #108161 - WaffleLapkin:const_param_ty, r=BoxyUwU
Dylan-DPC May 2, 2023
f379a58
Rollup merge of #108668 - gibbyfree:stabilizedebuggervisualizer, r=we…
Dylan-DPC May 2, 2023
be4f9f5
Rollup merge of #110512 - compiler-errors:fix-elaboration-with-associ…
Dylan-DPC May 2, 2023
f47a63c
Rollup merge of #110895 - Ayush1325:thread-local-fix, r=thomcc
Dylan-DPC May 2, 2023
40c4ed4
Rollup merge of #110955 - fee1-dead-contrib:sus-operation, r=compiler…
Dylan-DPC May 2, 2023
2e3373c
Rollup merge of #111048 - compiler-errors:rpitit-not-incomplete, r=ja…
Dylan-DPC May 2, 2023
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
Fix compile test so it normalizes (un)expected error messages
  • Loading branch information
WaffleLapkin committed Apr 27, 2023
commit 2f70d02df46916a56f15ef52b13a99c3a69fbd5b
7 changes: 5 additions & 2 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,9 @@ impl<'test> TestCx<'test> {
let actual_errors = json::parse_output(&diagnostic_file_name, &proc_res.stderr, proc_res);
let mut unexpected = Vec::new();
let mut found = vec![false; expected_errors.len()];
for actual_error in &actual_errors {
for mut actual_error in actual_errors {
actual_error.msg = self.normalize_output(&actual_error.msg, &[]);

let opt_index =
expected_errors.iter().enumerate().position(|(index, expected_error)| {
!found[index]
Expand All @@ -1403,7 +1405,8 @@ impl<'test> TestCx<'test> {

None => {
// If the test is a known bug, don't require that the error is annotated
if self.is_unexpected_compiler_message(actual_error, expect_help, expect_note) {
if self.is_unexpected_compiler_message(&actual_error, expect_help, expect_note)
{
self.error(&format!(
"{}:{}: unexpected {}: '{}'",
file_name,
Expand Down