Skip to content

Commit 1333632

Browse files
authored
Rollup merge of #119098 - compiler-errors:hangs, r=lcnr
Adjust the ignore-compare-mode-next-solver for hangs Some new tests hang, some old tests don't hang. r? lcnr or anyone in `@rust-lang/initiative-trait-system-refactor`
2 parents 9a72b7d + e1c03e9 commit 1333632

11 files changed

+18
-13
lines changed

tests/ui/issues/issue-22638.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// build-fail
22
// normalize-stderr-test: "<\{closure@.+`" -> "$$CLOSURE`"
33
// normalize-stderr-test: ".nll/" -> "/"
4+
// ignore-compare-mode-next-solver (hangs)
45

56
#![allow(unused)]
67

tests/ui/issues/issue-22638.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: reached the recursion limit while instantiating `A::matches::$CLOSURE`
2-
--> $DIR/issue-22638.rs:56:9
2+
--> $DIR/issue-22638.rs:57:9
33
|
44
LL | a.matches(f)
55
| ^^^^^^^^^^^^
66
|
77
note: `A::matches` defined here
8-
--> $DIR/issue-22638.rs:15:5
8+
--> $DIR/issue-22638.rs:16:5
99
|
1010
LL | pub fn matches<F: Fn()>(&self, f: &F) {
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/issues/issue-67552.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// build-fail
22
// compile-flags: -Copt-level=0
33
// normalize-stderr-test: ".nll/" -> "/"
4-
// ignore-compare-mode-next-solver (hangs)
54

65
fn main() {
76
rec(Empty);

tests/ui/issues/issue-67552.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: reached the recursion limit while instantiating `rec::<&mut &mut &mut &mut &mut ...>`
2-
--> $DIR/issue-67552.rs:30:9
2+
--> $DIR/issue-67552.rs:29:9
33
|
44
LL | rec(identity(&mut it))
55
| ^^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: `rec` defined here
8-
--> $DIR/issue-67552.rs:23:1
8+
--> $DIR/issue-67552.rs:22:1
99
|
1010
LL | / fn rec<T>(mut it: T)
1111
LL | | where

tests/ui/recursion/issue-95134.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// compile-flags: -Copt-level=0
44
// dont-check-failure-status
55
// dont-check-compiler-stderr
6-
// ignore-compare-mode-next-solver (hangs)
76

87
pub fn encode_num<Writer: ExampleWriter>(n: u32, mut writer: Writer) -> Result<(), Writer::Error> {
98
if n > 15 {

tests/ui/type-alias-impl-trait/self-referential-3.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-compare-mode-next-solver (hangs)
2+
13
#![feature(type_alias_impl_trait)]
24

35
type Bar<'a, 'b> = impl PartialEq<Bar<'a, 'b>> + std::fmt::Debug;

tests/ui/type-alias-impl-trait/self-referential-3.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: can't compare `&i32` with `Bar<'a, 'b>`
2-
--> $DIR/self-referential-3.rs:5:31
2+
--> $DIR/self-referential-3.rs:7:31
33
|
44
LL | fn bar<'a, 'b>(i: &'a i32) -> Bar<'a, 'b> {
55
| ^^^^^^^^^^^ no implementation for `&i32 == Bar<'a, 'b>`

tests/ui/type-alias-impl-trait/self-referential-4.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-compare-mode-next-solver (hangs)
2+
13
#![feature(type_alias_impl_trait)]
24

35
type Bar<'a, 'b> = impl PartialEq<Bar<'b, 'static>> + std::fmt::Debug;

tests/ui/type-alias-impl-trait/self-referential-4.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: can't compare `&i32` with `Bar<'b, 'static>`
2-
--> $DIR/self-referential-4.rs:5:31
2+
--> $DIR/self-referential-4.rs:7:31
33
|
44
LL | fn bar<'a, 'b>(i: &'a i32) -> Bar<'a, 'b> {
55
| ^^^^^^^^^^^ no implementation for `&i32 == Bar<'b, 'static>`
@@ -10,7 +10,7 @@ LL | i
1010
= help: the trait `PartialEq` is implemented for `i32`
1111

1212
error[E0277]: can't compare `&i32` with `Foo<'static, 'b>`
13-
--> $DIR/self-referential-4.rs:11:31
13+
--> $DIR/self-referential-4.rs:13:31
1414
|
1515
LL | fn foo<'a, 'b>(i: &'a i32) -> Foo<'a, 'b> {
1616
| ^^^^^^^^^^^ no implementation for `&i32 == Foo<'static, 'b>`
@@ -21,7 +21,7 @@ LL | i
2121
= help: the trait `PartialEq` is implemented for `i32`
2222

2323
error[E0277]: can't compare `&i32` with `Moo<'static, 'a>`
24-
--> $DIR/self-referential-4.rs:17:31
24+
--> $DIR/self-referential-4.rs:19:31
2525
|
2626
LL | fn moo<'a, 'b>(i: &'a i32) -> Moo<'a, 'b> {
2727
| ^^^^^^^^^^^ no implementation for `&i32 == Moo<'static, 'a>`

tests/ui/type-alias-impl-trait/self-referential.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore-compare-mode-next-solver (hangs)
2+
13
#![feature(type_alias_impl_trait)]
24

35
type Bar<'a, 'b> = impl PartialEq<Bar<'b, 'a>> + std::fmt::Debug;

tests/ui/type-alias-impl-trait/self-referential.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: can't compare `&i32` with `Bar<'b, 'a>`
2-
--> $DIR/self-referential.rs:5:31
2+
--> $DIR/self-referential.rs:7:31
33
|
44
LL | fn bar<'a, 'b>(i: &'a i32) -> Bar<'a, 'b> {
55
| ^^^^^^^^^^^ no implementation for `&i32 == Bar<'b, 'a>`
@@ -11,7 +11,7 @@ LL | i
1111
= help: the trait `PartialEq` is implemented for `i32`
1212

1313
error[E0277]: can't compare `&i32` with `(i32, Foo<'a, 'b>::{opaque#0})`
14-
--> $DIR/self-referential.rs:12:31
14+
--> $DIR/self-referential.rs:14:31
1515
|
1616
LL | fn foo<'a, 'b>(i: &'a i32) -> Foo<'a, 'b> {
1717
| ^^^^^^^^^^^ no implementation for `&i32 == (i32, Foo<'a, 'b>::{opaque#0})`
@@ -23,7 +23,7 @@ LL | (42, i)
2323
= help: the trait `PartialEq` is implemented for `i32`
2424

2525
error[E0277]: can't compare `&i32` with `(i32, Moo<'b, 'a>::{opaque#0})`
26-
--> $DIR/self-referential.rs:19:31
26+
--> $DIR/self-referential.rs:21:31
2727
|
2828
LL | fn moo<'a, 'b>(i: &'a i32) -> Moo<'a, 'b> {
2929
| ^^^^^^^^^^^ no implementation for `&i32 == (i32, Moo<'b, 'a>::{opaque#0})`

0 commit comments

Comments
 (0)