diff options
| author | bors <bors@rust-lang.org> | 2025-04-03 12:05:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-03 12:05:32 +0000 |
| commit | 946aea0b3d9f43e57953ce5094d8e4a2a244ce71 (patch) | |
| tree | 3d8fec4dfe48f821804107325d4bbe571f5f5bf3 /tests/ui/errors/remap-path-prefix-sysroot.rs | |
| parent | e0883a2a6c8e4afcb6e26a182885f687ba63a7f5 (diff) | |
| parent | 4916d44b59a2b5347506b4551b389fe902bdf54b (diff) | |
| download | rust-946aea0b3d9f43e57953ce5094d8e4a2a244ce71.tar.gz rust-946aea0b3d9f43e57953ce5094d8e4a2a244ce71.zip | |
Auto merge of #139137 - petrochenkov:errwhere2, r=jieyouxu
compiletest: Require `//~` annotations even if `error-pattern` is specified
This is continuation of #138865 with some help from #139100.
`error-pattern` annotations that duplicate the newly added `//~` annotations are removed, other `error-pattern`s are not touched yet.
In exceptional cases `//@ compile-flags: --error-format=human` can be used to opt out of these checks.
In this PR I only had to use the opt out 3 times:
- `tests/ui/parser/utf16-{be,le}-without-bom.rs` - there are too many errors that are nearly identical (modulo location), because an error is reported on every second symbol
- `tests/ui-fulldeps/missing-rustc-driver-error.rs` - the errors list various rustc crate dependencies and may unexpectedly invalidate on random rustc changes
Diffstat (limited to 'tests/ui/errors/remap-path-prefix-sysroot.rs')
| -rw-r--r-- | tests/ui/errors/remap-path-prefix-sysroot.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ui/errors/remap-path-prefix-sysroot.rs b/tests/ui/errors/remap-path-prefix-sysroot.rs index 7281e6da094..5e2e4fab51d 100644 --- a/tests/ui/errors/remap-path-prefix-sysroot.rs +++ b/tests/ui/errors/remap-path-prefix-sysroot.rs @@ -3,7 +3,6 @@ //@ [with-remap]compile-flags: --remap-path-prefix={{rust-src-base}}=remapped //@ [with-remap]compile-flags: --remap-path-prefix={{src-base}}=remapped-tests-ui //@ [without-remap]compile-flags: -//@ error-pattern: E0507 // The $SRC_DIR*.rs:LL:COL normalisation doesn't kick in automatically // as the remapped revision will not begin with $SRC_DIR_REAL, @@ -18,7 +17,10 @@ struct Worker { impl Drop for Worker { fn drop(&mut self) { self.thread.join().unwrap(); + //[without-remap]~^ ERROR cannot move out of `self.thread` which is behind a mutable reference } } pub fn main(){} + +//[with-remap]~? ERROR cannot move out of `self.thread` which is behind a mutable reference |