diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-04-12 22:40:34 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-04-13 21:48:53 +0300 |
| commit | 93bee0789a45ea7d5d65bb9301c4ad5ece3abeb2 (patch) | |
| tree | 8202c945e49e3034cfa410245a935b14f7b4ce50 /tests/incremental | |
| parent | 092a284ba0421695f2032c947765429fd7095796 (diff) | |
| download | rust-93bee0789a45ea7d5d65bb9301c4ad5ece3abeb2.tar.gz rust-93bee0789a45ea7d5d65bb9301c4ad5ece3abeb2.zip | |
UI tests: migrate remaining compile time `error-pattern`s to line annotations
when possible.
Diffstat (limited to 'tests/incremental')
| -rw-r--r-- | tests/incremental/const-generic-type-cycle.rs | 5 | ||||
| -rw-r--r-- | tests/incremental/delayed_span_bug.rs | 3 | ||||
| -rw-r--r-- | tests/incremental/link_order/main.rs | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/tests/incremental/const-generic-type-cycle.rs b/tests/incremental/const-generic-type-cycle.rs index cd0437f7ef6..40a40ebd13f 100644 --- a/tests/incremental/const-generic-type-cycle.rs +++ b/tests/incremental/const-generic-type-cycle.rs @@ -3,7 +3,6 @@ // //@ compile-flags: -Zincremental-ignore-spans //@ revisions: cpass cfail -//@ error-pattern: cycle detected when computing type of `Bar::N` #![feature(trait_alias)] #![crate_type="lib"] @@ -13,5 +12,9 @@ trait Bar<const N: usize> {} #[cfg(cfail)] trait Bar<const N: dyn BB> {} +//[cfail]~^ ERROR cycle detected when computing type of `Bar::N` +//[cfail]~| ERROR cycle detected when computing type of `Bar::N` +//[cfail]~| ERROR cycle detected when computing type of `Bar::N` +//[cfail]~| ERROR `(dyn Bar<{ 2 + 1 }> + 'static)` is forbidden as the type of a const generic parameter trait BB = Bar<{ 2 + 1 }>; diff --git a/tests/incremental/delayed_span_bug.rs b/tests/incremental/delayed_span_bug.rs index 1534aca5ddd..7b409db2e18 100644 --- a/tests/incremental/delayed_span_bug.rs +++ b/tests/incremental/delayed_span_bug.rs @@ -1,8 +1,7 @@ //@ revisions: cfail1 cfail2 //@ should-ice -//@ error-pattern: delayed bug triggered by #[rustc_delayed_bug_from_inside_query] #![feature(rustc_attrs)] #[rustc_delayed_bug_from_inside_query] -fn main() {} +fn main() {} //~ ERROR delayed bug triggered by #[rustc_delayed_bug_from_inside_query] diff --git a/tests/incremental/link_order/main.rs b/tests/incremental/link_order/main.rs index 847a47a7559..20931e25dd4 100644 --- a/tests/incremental/link_order/main.rs +++ b/tests/incremental/link_order/main.rs @@ -1,5 +1,4 @@ //@ aux-build:my_lib.rs -//@ error-pattern: error: linking with //@ revisions:cfail1 cfail2 //@ compile-flags:-Z query-dep-graph @@ -10,3 +9,5 @@ extern crate my_lib; fn main() {} + +//~? ERROR linking with |