Skip to content

Rollup of 5 pull requests #139694

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

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
compiletest: Trim the value of dont-require-annotations
  • Loading branch information
petrochenkov committed Apr 10, 2025
commit 06dd9e2d20db8ba9b260fa750f09ea969fb57b87
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ impl TestProps {
config.parse_name_value_directive(ln, DONT_REQUIRE_ANNOTATIONS)
{
self.dont_require_annotations
.insert(ErrorKind::expect_from_user_str(&err_kind));
.insert(ErrorKind::expect_from_user_str(err_kind.trim()));
}
},
);
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/async-await/suggest-missing-await.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@ edition:2018
//@ dont-require-annotations:SUGGESTION
//@ dont-require-annotations: SUGGESTION

fn take_u32(_x: u32) {}

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/cast/cast-as-bool.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ dont-require-annotations:SUGGESTION
//@ dont-require-annotations: SUGGESTION

fn main() {
let u = 5 as bool; //~ ERROR cannot cast `i32` as `bool`
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/cfg/cfg_false_no_std-2.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Error, the linked empty library is `no_std` and doesn't provide a panic handler.

//@ dont-require-annotations:ERROR
//@ dont-require-annotations: ERROR
//@ dont-check-compiler-stderr
//@ aux-build: cfg_false_lib_no_std_before.rs

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/panic-runtime/two-panic-runtimes.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ignore-tidy-linelength
//@ build-fail
//@ dont-require-annotations:ERROR
//@ dont-require-annotations: ERROR
//@ dont-check-compiler-stderr
//@ aux-build:panic-runtime-unwind.rs
//@ aux-build:panic-runtime-unwind2.rs
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/panic-runtime/want-abort-got-unwind.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ignore-tidy-linelength
//@ build-fail
//@ dont-require-annotations:ERROR
//@ dont-require-annotations: ERROR
//@ dont-check-compiler-stderr
//@ aux-build:panic-runtime-unwind.rs
//@ compile-flags:-C panic=abort
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/panic-runtime/want-abort-got-unwind2.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ignore-tidy-linelength
//@ build-fail
//@ dont-require-annotations:ERROR
//@ dont-require-annotations: ERROR
//@ dont-check-compiler-stderr
//@ aux-build:panic-runtime-unwind.rs
//@ aux-build:wants-panic-runtime-unwind.rs
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/parser/inverted-parameters.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ dont-require-annotations:SUGGESTION
//@ dont-require-annotations: SUGGESTION

struct S;

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/suggestions/suggest-ref-mut.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ dont-require-annotations:SUGGESTION
//@ dont-require-annotations: SUGGESTION

struct X(usize);

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/typeck/issue-90027-async-fn-return-suggestion.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@ edition:2018
//@ dont-require-annotations:SUGGESTION
//@ dont-require-annotations: SUGGESTION

async fn hello() { //~ HELP try adding a return type
0
Expand Down
Loading