user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #97789 - ferrocene:pa-fix-issue-71363-test, r=cjgillot

Browse source 
Fix #71363's test by adding `-Z translate-remapped-path-to-local-path=no`

The test relies on `library/std/src/error.rs` not corresponding to a local path, but remapping might still find the related local file of a remapped path. To fix the test, this PR adds a new `-Z` flag to disable finding the corresponding local path of a remapped path.
This commit is contained in:
Dylan DPC 2022-06-11 12:59:27 +02:00 • committed by GitHub
commit b7b5045364
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/test/ui/span/issue-71363.rs
View file

@ -1,6 +1,4 @@
// compile-flags: -Z simulate-remapped-rust-src-base=/rustc/xyz -Z ui-testing=no
// only-x86_64-unknown-linux-gnu
//---^ Limiting target as the above unstable flags don't play well on some environment.
// compile-flags: -Z simulate-remapped-rust-src-base=/rustc/xyz -Z translate-remapped-path-to-local-path=no -Z ui-testing=no
struct MyError;
impl std::error::Error for MyError {}
@ -8,3 +6,14 @@ impl std::error::Error for MyError {}
//~| ERROR: `MyError` doesn't implement `Debug`
fn main() {}
// This test relies on library/std/src/error.rs *not* being included in the error message, so that
// we can test whether a file not included in the error message affects it (more specifically
// whether the line number of the excluded file affects the indentation of the other line numbers).
//
// To test this we're simulating a remap of the rust src base (so that library/std/src/error.rs
// does not point to a local file) *and* we're disabling the code to try mapping a remapped path to
// a local file (which would defeat the purpose of the former flag).
//
// Note that this comment is at the bottom of the file intentionally, as we need the line number of
// the impl to be lower than 10.

10
src/test/ui/span/issue-71363.stderr
View file

@ -1,7 +1,7 @@
error[E0277]: `MyError` doesn't implement `std::fmt::Display`
--> $DIR/issue-71363.rs:6:6
--> $DIR/issue-71363.rs:4:6
|
6 | impl std::error::Error for MyError {}
4 | impl std::error::Error for MyError {}
| ^^^^^^^^^^^^^^^^^ `MyError` cannot be formatted with the default formatter
|
= help: the trait `std::fmt::Display` is not implemented for `MyError`
@ -9,9 +9,9 @@ error[E0277]: `MyError` doesn't implement `std::fmt::Display`
note: required by a bound in `std::error::Error`
error[E0277]: `MyError` doesn't implement `Debug`
--> $DIR/issue-71363.rs:6:6
--> $DIR/issue-71363.rs:4:6
|
6 | impl std::error::Error for MyError {}
4 | impl std::error::Error for MyError {}
| ^^^^^^^^^^^^^^^^^ `MyError` cannot be formatted using `{:?}`
|
= help: the trait `Debug` is not implemented for `MyError`
@ -19,7 +19,7 @@ error[E0277]: `MyError` doesn't implement `Debug`
note: required by a bound in `std::error::Error`
help: consider annotating `MyError` with `#[derive(Debug)]`
|
5 | #[derive(Debug)]
3 | #[derive(Debug)]
|
error: aborting due to 2 previous errors