Skip to content

Commit 3830510

Browse files
Ignore tests w/ current/next revisions from compare-mode=next-solver
1 parent 76ee6fc commit 3830510

File tree

137 files changed

+501
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+501
-363
lines changed

tests/ui/associated-inherent-types/inference.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Testing inference capabilities.
22
//@ check-pass
33
//@ revisions: current next
4+
//@ ignore-compare-mode-next-solver (explicit revisions)
45
//@[next] compile-flags: -Znext-solver
56

67
#![feature(inherent_associated_types)]

tests/ui/async-await/async-closures/is-fn.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ edition:2021
33
//@ build-pass
44
//@ revisions: current next
5+
//@ ignore-compare-mode-next-solver (explicit revisions)
56
//@[next] compile-flags: -Znext-solver
67

78
#![feature(async_closure)]

tests/ui/async-await/async-closures/once.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//@ edition:2021
33
//@ build-pass
44
//@ revisions: current next
5+
//@ ignore-compare-mode-next-solver (explicit revisions)
56
//@[next] compile-flags: -Znext-solver
67

78
#![feature(async_closure)]

tests/ui/async-await/async-fn/higher-ranked-async-fn.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ aux-build:block-on.rs
22
//@ edition:2018
33
//@ revisions: current next
4+
//@ ignore-compare-mode-next-solver (explicit revisions)
45
//@[next] compile-flags: -Znext-solver
56
//@ build-pass (since it ICEs during mono)
67

tests/ui/async-await/async-fn/project.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ edition:2018
22
//@ revisions: current next
3+
//@ ignore-compare-mode-next-solver (explicit revisions)
34
//@[next] compile-flags: -Znext-solver
45
//@ check-pass
56

tests/ui/async-await/normalize-output-in-signature-deduction.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ edition:2021
22
//@ revisions: current next
3+
//@ ignore-compare-mode-next-solver (explicit revisions)
34
//@[next] compile-flags: -Znext-solver
45
//@ check-pass
56

tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/normalizing-self-auto-trait-issue-109924.rs:6:12
2+
--> $DIR/normalizing-self-auto-trait-issue-109924.rs:7:12
33
|
44
LL | #![feature(return_type_notation)]
55
| ^^^^^^^^^^^^^^^^^^^^

tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/normalizing-self-auto-trait-issue-109924.rs:6:12
2+
--> $DIR/normalizing-self-auto-trait-issue-109924.rs:7:12
33
|
44
LL | #![feature(return_type_notation)]
55
| ^^^^^^^^^^^^^^^^^^^^

tests/ui/async-await/return-type-notation/normalizing-self-auto-trait-issue-109924.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ check-pass
22
//@ revisions: current next
3+
//@ ignore-compare-mode-next-solver (explicit revisions)
34
//@[next] compile-flags: -Znext-solver
45
//@ edition:2021
56

tests/ui/auto-traits/issue-23080-2.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0380]: auto traits cannot have associated items
2-
--> $DIR/issue-23080-2.rs:8:10
2+
--> $DIR/issue-23080-2.rs:9:10
33
|
44
LL | unsafe auto trait Trait {
55
| ----- auto traits cannot have associated items

tests/ui/auto-traits/issue-23080-2.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0380]: auto traits cannot have associated items
2-
--> $DIR/issue-23080-2.rs:8:10
2+
--> $DIR/issue-23080-2.rs:9:10
33
|
44
LL | unsafe auto trait Trait {
55
| ----- auto traits cannot have associated items

tests/ui/auto-traits/issue-23080-2.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
#![feature(auto_traits)]

tests/ui/closures/infer-signature-from-impl.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0282]: type annotations needed
2-
--> $DIR/infer-signature-from-impl.rs:17:16
2+
--> $DIR/infer-signature-from-impl.rs:18:16
33
|
44
LL | needs_foo(|x| {
55
| ^

tests/ui/closures/infer-signature-from-impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34
//@[next] known-bug: trait-system-refactor-initiative#71
45
//@[current] check-pass

tests/ui/coherence/normalize-for-errors.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `MyTrait<_>` for type `(Box<(MyType,)>, _)`
2-
--> $DIR/normalize-for-errors.rs:16:1
2+
--> $DIR/normalize-for-errors.rs:17:1
33
|
44
LL | impl<T: Copy, S: Iterator> MyTrait<S> for (T, S::Item) {}
55
| ------------------------------------------------------ first implementation here

tests/ui/coherence/normalize-for-errors.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `MyTrait<_>` for type `(Box<(MyType,)>, <_ as Iterator>::Item)`
2-
--> $DIR/normalize-for-errors.rs:16:1
2+
--> $DIR/normalize-for-errors.rs:17:1
33
|
44
LL | impl<T: Copy, S: Iterator> MyTrait<S> for (T, S::Item) {}
55
| ------------------------------------------------------ first implementation here

tests/ui/coherence/normalize-for-errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
struct MyType;

tests/ui/coroutine/clone-rpit.next.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
error[E0391]: cycle detected when type-checking `foo`
2-
--> $DIR/clone-rpit.rs:12:1
2+
--> $DIR/clone-rpit.rs:13:1
33
|
44
LL | pub fn foo<'a, 'b>() -> impl Clone {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: ...which requires coroutine witness types for `foo::{closure#0}`...
8-
--> $DIR/clone-rpit.rs:13:5
8+
--> $DIR/clone-rpit.rs:14:5
99
|
1010
LL | move |_: ()| {
1111
| ^^^^^^^^^^^^
1212
note: ...which requires promoting constants in MIR for `foo::{closure#0}`...
13-
--> $DIR/clone-rpit.rs:13:5
13+
--> $DIR/clone-rpit.rs:14:5
1414
|
1515
LL | move |_: ()| {
1616
| ^^^^^^^^^^^^
1717
note: ...which requires preparing `foo::{closure#0}` for borrow checking...
18-
--> $DIR/clone-rpit.rs:13:5
18+
--> $DIR/clone-rpit.rs:14:5
1919
|
2020
LL | move |_: ()| {
2121
| ^^^^^^^^^^^^
2222
note: ...which requires checking if `foo::{closure#0}` contains FFI-unwind calls...
23-
--> $DIR/clone-rpit.rs:13:5
23+
--> $DIR/clone-rpit.rs:14:5
2424
|
2525
LL | move |_: ()| {
2626
| ^^^^^^^^^^^^
2727
note: ...which requires building MIR for `foo::{closure#0}`...
28-
--> $DIR/clone-rpit.rs:13:5
28+
--> $DIR/clone-rpit.rs:14:5
2929
|
3030
LL | move |_: ()| {
3131
| ^^^^^^^^^^^^
3232
note: ...which requires match-checking `foo::{closure#0}`...
33-
--> $DIR/clone-rpit.rs:13:5
33+
--> $DIR/clone-rpit.rs:14:5
3434
|
3535
LL | move |_: ()| {
3636
| ^^^^^^^^^^^^
3737
note: ...which requires type-checking `foo::{closure#0}`...
38-
--> $DIR/clone-rpit.rs:13:5
38+
--> $DIR/clone-rpit.rs:14:5
3939
|
4040
LL | move |_: ()| {
4141
| ^^^^^^^^^^^^
4242
= note: ...which again requires type-checking `foo`, completing the cycle
4343
note: cycle used when computing type of opaque `foo::{opaque#0}`
44-
--> $DIR/clone-rpit.rs:12:25
44+
--> $DIR/clone-rpit.rs:13:25
4545
|
4646
LL | pub fn foo<'a, 'b>() -> impl Clone {
4747
| ^^^^^^^^^^

tests/ui/coroutine/clone-rpit.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34
//@[current] check-pass
45
//@[next] known-bug: trait-system-refactor-initiative#82

tests/ui/coroutine/non-static-is-unpin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34
//@ run-pass
45

tests/ui/coroutine/static-not-unpin.current.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
error[E0277]: `{static coroutine@$DIR/static-not-unpin.rs:14:25: 14:34}` cannot be unpinned
2-
--> $DIR/static-not-unpin.rs:17:18
1+
error[E0277]: `{static coroutine@$DIR/static-not-unpin.rs:15:25: 15:34}` cannot be unpinned
2+
--> $DIR/static-not-unpin.rs:18:18
33
|
44
LL | assert_unpin(coroutine);
5-
| ------------ ^^^^^^^^^ the trait `Unpin` is not implemented for `{static coroutine@$DIR/static-not-unpin.rs:14:25: 14:34}`
5+
| ------------ ^^^^^^^^^ the trait `Unpin` is not implemented for `{static coroutine@$DIR/static-not-unpin.rs:15:25: 15:34}`
66
| |
77
| required by a bound introduced by this call
88
|
99
= note: consider using the `pin!` macro
1010
consider using `Box::pin` if you need to access the pinned value outside of the current scope
1111
note: required by a bound in `assert_unpin`
12-
--> $DIR/static-not-unpin.rs:10:20
12+
--> $DIR/static-not-unpin.rs:11:20
1313
|
1414
LL | fn assert_unpin<T: Unpin>(_: T) {
1515
| ^^^^^ required by this bound in `assert_unpin`

tests/ui/coroutine/static-not-unpin.next.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
error[E0277]: `{static coroutine@$DIR/static-not-unpin.rs:14:25: 14:34}` cannot be unpinned
2-
--> $DIR/static-not-unpin.rs:17:18
1+
error[E0277]: `{static coroutine@$DIR/static-not-unpin.rs:15:25: 15:34}` cannot be unpinned
2+
--> $DIR/static-not-unpin.rs:18:18
33
|
44
LL | assert_unpin(coroutine);
5-
| ------------ ^^^^^^^^^ the trait `Unpin` is not implemented for `{static coroutine@$DIR/static-not-unpin.rs:14:25: 14:34}`
5+
| ------------ ^^^^^^^^^ the trait `Unpin` is not implemented for `{static coroutine@$DIR/static-not-unpin.rs:15:25: 15:34}`
66
| |
77
| required by a bound introduced by this call
88
|
99
= note: consider using the `pin!` macro
1010
consider using `Box::pin` if you need to access the pinned value outside of the current scope
1111
note: required by a bound in `assert_unpin`
12-
--> $DIR/static-not-unpin.rs:10:20
12+
--> $DIR/static-not-unpin.rs:11:20
1313
|
1414
LL | fn assert_unpin<T: Unpin>(_: T) {
1515
| ^^^^^ required by this bound in `assert_unpin`

tests/ui/coroutine/static-not-unpin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
#![feature(coroutines)]

tests/ui/dyn-star/box.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ run-pass
22
//@ revisions: current next
3+
//@ ignore-compare-mode-next-solver (explicit revisions)
34
//@[current] compile-flags: -C opt-level=0
45
//@[next] compile-flags: -Znext-solver -C opt-level=0
56

tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `&T` needs to have the same ABI as a pointer
2-
--> $DIR/check-size-at-cast-polymorphic-bad.rs:14:15
2+
--> $DIR/check-size-at-cast-polymorphic-bad.rs:15:15
33
|
44
LL | dyn_debug(t);
55
| ^ `&T` needs to be a pointer-like type

tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `&T` needs to have the same ABI as a pointer
2-
--> $DIR/check-size-at-cast-polymorphic-bad.rs:14:15
2+
--> $DIR/check-size-at-cast-polymorphic-bad.rs:15:15
33
|
44
LL | dyn_debug(t);
55
| ^ `&T` needs to be a pointer-like type

tests/ui/dyn-star/check-size-at-cast-polymorphic-bad.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
#![feature(dyn_star)]

tests/ui/for/issue-20605.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: `dyn Iterator<Item = &'a mut u8>` is not an iterator
2-
--> $DIR/issue-20605.rs:5:17
2+
--> $DIR/issue-20605.rs:6:17
33
|
44
LL | for item in *things { *item = 0 }
55
| ^^^^^^^ the trait `IntoIterator` is not implemented for `dyn Iterator<Item = &'a mut u8>`

tests/ui/for/issue-20605.next.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
error[E0277]: `dyn Iterator<Item = &'a mut u8>` is not an iterator
2-
--> $DIR/issue-20605.rs:5:17
2+
--> $DIR/issue-20605.rs:6:17
33
|
44
LL | for item in *things { *item = 0 }
55
| ^^^^^^^ `dyn Iterator<Item = &'a mut u8>` is not an iterator
66
|
77
= help: the trait `IntoIterator` is not implemented for `dyn Iterator<Item = &'a mut u8>`
88

99
error: the type `<dyn Iterator<Item = &'a mut u8> as IntoIterator>::IntoIter` is not well-formed
10-
--> $DIR/issue-20605.rs:5:17
10+
--> $DIR/issue-20605.rs:6:17
1111
|
1212
LL | for item in *things { *item = 0 }
1313
| ^^^^^^^
1414

1515
error: the type `&mut <dyn Iterator<Item = &'a mut u8> as IntoIterator>::IntoIter` is not well-formed
16-
--> $DIR/issue-20605.rs:5:17
16+
--> $DIR/issue-20605.rs:6:17
1717
|
1818
LL | for item in *things { *item = 0 }
1919
| ^^^^^^^
2020

2121
error: the type `Option<<<dyn Iterator<Item = &'a mut u8> as IntoIterator>::IntoIter as Iterator>::Item>` is not well-formed
22-
--> $DIR/issue-20605.rs:5:17
22+
--> $DIR/issue-20605.rs:6:17
2323
|
2424
LL | for item in *things { *item = 0 }
2525
| ^^^^^^^
2626

2727
error[E0614]: type `<dyn Iterator<Item = &'a mut u8> as IntoIterator>::Item` cannot be dereferenced
28-
--> $DIR/issue-20605.rs:5:27
28+
--> $DIR/issue-20605.rs:6:27
2929
|
3030
LL | for item in *things { *item = 0 }
3131
| ^^^^^

tests/ui/for/issue-20605.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
fn changer<'a>(mut things: Box<dyn Iterator<Item=&'a mut u8>>) {

tests/ui/generic-associated-types/issue-102114.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0049]: type `B` has 1 type parameter but its trait declaration has 0 type parameters
2-
--> $DIR/issue-102114.rs:14:12
2+
--> $DIR/issue-102114.rs:15:12
33
|
44
LL | type B<'b>;
55
| -- expected 0 type parameters

tests/ui/generic-associated-types/issue-102114.next.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0049]: type `B` has 1 type parameter but its trait declaration has 0 type parameters
2-
--> $DIR/issue-102114.rs:14:12
2+
--> $DIR/issue-102114.rs:15:12
33
|
44
LL | type B<'b>;
55
| -- expected 0 type parameters

tests/ui/generic-associated-types/issue-102114.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34

45
trait A {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error[E0277]: expected a `Fn(&'w ())` closure, found `fn(&'w ())`
2+
--> $DIR/fn-ptr.rs:13:5
3+
|
4+
LL | ice();
5+
| ^^^^^ expected an `Fn(&'w ())` closure, found `fn(&'w ())`
6+
|
7+
= help: the trait `for<'w> Fn<(&'w (),)>` is not implemented for `fn(&'w ())`
8+
note: required by a bound in `ice`
9+
--> $DIR/fn-ptr.rs:8:25
10+
|
11+
LL | fn ice()
12+
| --- required by a bound in this function
13+
LL | where
14+
LL | for<'w> fn(&'w ()): Fn(&'w ()),
15+
| ^^^^^^^^^^ required by this bound in `ice`
16+
17+
error: aborting due to 1 previous error
18+
19+
For more information about this error, try `rustc --explain E0277`.

tests/ui/higher-ranked/trait-bounds/fn-ptr.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//@ revisions: classic next
1+
//@ revisions: current next
2+
//@ ignore-compare-mode-next-solver (explicit revisions)
23
//@[next] compile-flags: -Znext-solver
34
//@[next] check-pass
45

@@ -10,5 +11,5 @@ where
1011

1112
fn main() {
1213
ice();
13-
//[classic]~^ ERROR expected a `Fn(&'w ())` closure, found `fn(&'w ())`
14+
//[current]~^ ERROR expected a `Fn(&'w ())` closure, found `fn(&'w ())`
1415
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
error: the compiler unexpectedly panicked. this is a bug.
2+
3+
query stack during panic:
4+
#0 [evaluate_obligation] evaluating trait selection obligation `for<'a> {async fn body@$DIR/future.rs:33:35: 35:2}: core::future::future::Future`
5+
#1 [codegen_select_candidate] computing candidate for `<strlen as Trait>`
6+
end of query stack

tests/ui/higher-ranked/trait-bounds/future.rs

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
// ignore-tidy-linelength
22
//@ edition:2021
3-
//@ revisions: classic next
3+
//@ revisions: current next
4+
//@ ignore-compare-mode-next-solver (explicit revisions)
45
//@[next] compile-flags: -Znext-solver
56
//@[next] check-pass
6-
//@[classic] known-bug: #112347
7-
//@[classic] build-fail
8-
//@[classic] failure-status: 101
9-
//@[classic] normalize-stderr-test "note: .*\n\n" -> ""
10-
//@[classic] normalize-stderr-test "thread 'rustc' panicked.*\n.*\n" -> ""
11-
//@[classic] normalize-stderr-test "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
12-
//@[classic] rustc-env:RUST_BACKTRACE=0
7+
//@[current] known-bug: #112347
8+
//@[current] build-fail
9+
//@[current] failure-status: 101
10+
//@[current] normalize-stderr-test "note: .*\n\n" -> ""
11+
//@[current] normalize-stderr-test "thread 'rustc' panicked.*\n.*\n" -> ""
12+
//@[current] normalize-stderr-test "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
13+
//@[current] rustc-env:RUST_BACKTRACE=0
1314

1415
#![feature(unboxed_closures)]
1516

0 commit comments

Comments
 (0)