-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #119184 - Rajveer100:branch-for-issue-118752, r=david…
…twco Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern` Fixes #118752 As noticed by ```@jyn514``` while working on a patch, tests failed due to `//~ERROR` annotations used in combination with the older `--error-format` which is now `error-pattern`.
- Loading branch information
Showing
22 changed files
with
664 additions
and
651 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
// compile-flags:--test --error-format=short | ||
// check-stdout | ||
// error-pattern:cannot find function `foo` in this scope | ||
// normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR" | ||
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" | ||
// failure-status: 101 | ||
|
||
/// ```rust | ||
/// foo(); | ||
/// ``` | ||
//~^^ ERROR cannot find function `foo` in this scope | ||
fn foo() { | ||
println!("Hello, world!"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
|
||
running 1 test | ||
test $DIR/issue-81662-shortness.rs - foo (line 6) ... FAILED | ||
test $DIR/issue-81662-shortness.rs - foo (line 8) ... FAILED | ||
|
||
failures: | ||
|
||
---- $DIR/issue-81662-shortness.rs - foo (line 6) stdout ---- | ||
$DIR/issue-81662-shortness.rs:7:1: error[E0425]: cannot find function `foo` in this scope | ||
---- $DIR/issue-81662-shortness.rs - foo (line 8) stdout ---- | ||
$DIR/issue-81662-shortness.rs:9:1: error[E0425]: cannot find function `foo` in this scope | ||
error: aborting due to 1 previous error | ||
Couldn't compile the test. | ||
|
||
failures: | ||
$DIR/issue-81662-shortness.rs - foo (line 6) | ||
$DIR/issue-81662-shortness.rs - foo (line 8) | ||
|
||
test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
// compile-flags: --error-format human-annotate-rs -Z unstable-options | ||
// error-pattern:cannot find type `Iter` in this scope | ||
|
||
pub fn main() { | ||
let x: Iter; //~ ERROR cannot find type `Iter` in this scope | ||
let x: Iter; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
// compile-flags: --diagnostic-width=20 --error-format=json | ||
// error-pattern:expected `()`, found integer | ||
|
||
// This test checks that `-Z output-width` effects the JSON error output by restricting it to an | ||
// arbitrarily low value so that the effect is visible. | ||
|
||
fn main() { | ||
let _: () = 42; | ||
//~^ ERROR arguments to this function are incorrect | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.