Skip to content

Commit 69fdd14

Browse files
lcnrlcnr
committed
remove unnecessary revisions
1 parent d93e047 commit 69fdd14

File tree

42 files changed

+22
-273
lines changed

Some content is hidden

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

42 files changed

+22
-273
lines changed

‎tests/ui/coherence/coherence-overlap-downstream-inherent.old.stderr

-23
This file was deleted.

‎tests/ui/coherence/coherence-overlap-downstream-inherent.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ revisions: old next
2-
//@[next] compile-flags: -Znext-solver
3-
41
// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
52
// though no impls are found.
63

‎tests/ui/coherence/coherence-overlap-downstream-inherent.next.stderr ‎tests/ui/coherence/coherence-overlap-downstream-inherent.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0592]: duplicate definitions with name `dummy`
2-
--> $DIR/coherence-overlap-downstream-inherent.rs:10:26
2+
--> $DIR/coherence-overlap-downstream-inherent.rs:7:26
33
|
44
LL | impl<T:Sugar> Sweet<T> { fn dummy(&self) { } }
55
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`
@@ -8,7 +8,7 @@ LL | impl<T:Fruit> Sweet<T> { fn dummy(&self) { } }
88
| --------------- other definition for `dummy`
99

1010
error[E0592]: duplicate definitions with name `f`
11-
--> $DIR/coherence-overlap-downstream-inherent.rs:16:38
11+
--> $DIR/coherence-overlap-downstream-inherent.rs:13:38
1212
|
1313
LL | impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
1414
| ^^^^^^^^^^^ duplicate definitions for `f`

‎tests/ui/coherence/coherence-overlap-downstream.old.stderr

-21
This file was deleted.

‎tests/ui/coherence/coherence-overlap-downstream.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ revisions: old next
2-
//@[next] compile-flags: -Znext-solver
3-
41
// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
52
// though no impls are found.
63

‎tests/ui/coherence/coherence-overlap-downstream.next.stderr ‎tests/ui/coherence/coherence-overlap-downstream.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0119]: conflicting implementations of trait `Sweet`
2-
--> $DIR/coherence-overlap-downstream.rs:11:1
2+
--> $DIR/coherence-overlap-downstream.rs:8:1
33
|
44
LL | impl<T:Sugar> Sweet for T { }
55
| ------------------------- first implementation here
66
LL | impl<T:Fruit> Sweet for T { }
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
88

99
error[E0119]: conflicting implementations of trait `Foo<_>` for type `i32`
10-
--> $DIR/coherence-overlap-downstream.rs:17:1
10+
--> $DIR/coherence-overlap-downstream.rs:14:1
1111
|
1212
LL | impl<X, T> Foo<X> for T where T: Bar<X> {}
1313
| --------------------------------------- first implementation here

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.old.stderr

-14
This file was deleted.

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ revisions: old next
2-
//@[next] compile-flags: -Znext-solver
3-
41
// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
52
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
63
// error is reported for the following pair of impls (#23516).

‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.next.stderr ‎tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0592]: duplicate definitions with name `dummy`
2-
--> $DIR/coherence-overlap-issue-23516-inherent.rs:12:25
2+
--> $DIR/coherence-overlap-issue-23516-inherent.rs:9:25
33
|
44
LL | impl<T:Sugar> Cake<T> { fn dummy(&self) { } }
55
| ^^^^^^^^^^^^^^^ duplicate definitions for `dummy`

‎tests/ui/coherence/coherence-overlap-issue-23516.old.stderr

-13
This file was deleted.

‎tests/ui/coherence/coherence-overlap-issue-23516.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ revisions: old next
2-
//@[next] compile-flags: -Znext-solver
3-
41
// Tests that we consider `Box<U>: !Sugar` to be ambiguous, even
52
// though we see no impl of `Sugar` for `Box`. Therefore, an overlap
63
// error is reported for the following pair of impls (#23516).

‎tests/ui/coherence/coherence-overlap-issue-23516.next.stderr ‎tests/ui/coherence/coherence-overlap-issue-23516.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Sweet` for type `Box<_>`
2-
--> $DIR/coherence-overlap-issue-23516.rs:11:1
2+
--> $DIR/coherence-overlap-issue-23516.rs:8:1
33
|
44
LL | impl<T:Sugar> Sweet for T { }
55
| ------------------------- first implementation here

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-0.next.stderr

-18
This file was deleted.

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-0.rs

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// "Coherence incorrectly considers `unnormalizable_projection: Trait` to not hold even if it could"
33
#![crate_type = "lib"]
44

5-
//@ revisions: classic next
6-
//@[next] compile-flags: -Znext-solver
7-
85
trait WhereBound {}
96
impl WhereBound for () {}
107

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-0.classic.stderr ‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-0.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait` for type `Box<_>`
2-
--> $DIR/coherence-overlap-unnormalizable-projection-0.rs:27:1
2+
--> $DIR/coherence-overlap-unnormalizable-projection-0.rs:24:1
33
|
44
LL | / impl<T> Trait for T
55
LL | | where

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-1.next.stderr

-19
This file was deleted.

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-1.rs

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// "Coherence incorrectly considers `unnormalizable_projection: Trait` to not hold even if it could"
33
#![crate_type = "lib"]
44

5-
//@ revisions: classic next
6-
//@[next] compile-flags: -Znext-solver
7-
85
pub trait WhereBound {}
96
impl WhereBound for () {}
107

‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-1.classic.stderr ‎tests/ui/coherence/coherence-overlap-unnormalizable-projection-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait` for type `Box<_>`
2-
--> $DIR/coherence-overlap-unnormalizable-projection-1.rs:26:1
2+
--> $DIR/coherence-overlap-unnormalizable-projection-1.rs:23:1
33
|
44
LL | / impl<T> Trait for T
55
LL | | where

‎tests/ui/coherence/coherent-due-to-fulfill.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
//@ compile-flags: -Znext-solver=coherence
21
//@ check-pass
3-
42
trait Mirror {
53
type Assoc;
64
}

‎tests/ui/coherence/incoherent-even-though-we-fulfill.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//@ compile-flags: -Znext-solver=coherence
2-
31
trait Mirror {
42
type Assoc;
53
}

‎tests/ui/coherence/incoherent-even-though-we-fulfill.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Foo` for type `()`
2-
--> $DIR/incoherent-even-though-we-fulfill.rs:17:1
2+
--> $DIR/incoherent-even-though-we-fulfill.rs:15:1
33
|
44
LL | impl<T> Foo for T where (): Mirror<Assoc = T> {}
55
| --------------------------------------------- first implementation here

‎tests/ui/coherence/inter-crate-ambiguity-causes-notes.old.stderr

-17
This file was deleted.

‎tests/ui/coherence/inter-crate-ambiguity-causes-notes.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ revisions: old next
2-
//@[next] compile-flags: -Znext-solver
3-
41
struct S;
52

63
impl From<()> for S {

‎tests/ui/coherence/inter-crate-ambiguity-causes-notes.next.stderr ‎tests/ui/coherence/inter-crate-ambiguity-causes-notes.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `From<()>` for type `S`
2-
--> $DIR/inter-crate-ambiguity-causes-notes.rs:12:1
2+
--> $DIR/inter-crate-ambiguity-causes-notes.rs:9:1
33
|
44
LL | impl From<()> for S {
55
| ------------------- first implementation here

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

-15
This file was deleted.

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

-15
This file was deleted.

‎tests/ui/coherence/occurs-check/associated-type.next.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
44
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
55
error[E0119]: conflicting implementations of trait `Overlap<for<'a> fn(&'a (), ())>` for type `for<'a> fn(&'a (), ())`
6-
--> $DIR/associated-type.rs:31:1
6+
--> $DIR/associated-type.rs:32:1
77
|
88
LL | impl<T> Overlap<T> for T {
99
| ------------------------ first implementation here
@@ -17,7 +17,7 @@ LL | | for<'a> *const T: ToUnit<'a>,
1717
= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
1818

1919
error[E0284]: type annotations needed: cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`
20-
--> $DIR/associated-type.rs:44:59
20+
--> $DIR/associated-type.rs:45:59
2121
|
2222
LL | foo::<for<'a> fn(&'a (), ()), for<'a> fn(&'a (), ())>(3usize);
2323
| ^^^^^^ cannot normalize `<for<'a> fn(&'a (), ()) as Overlap<for<'a> fn(&'a (), ())>>::Assoc`

‎tests/ui/coherence/occurs-check/associated-type.old.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
44
WARN rustc_infer::infer::relate::generalize may incompletely handle alias type: AliasTy { args: [*const ?1t, '^0.Named(DefId(0:27 ~ associated_type[f554]::{impl#3}::'a#1), "'a")], def_id: DefId(0:5 ~ associated_type[f554]::ToUnit::Unit), .. }
55
error[E0119]: conflicting implementations of trait `Overlap<for<'a> fn(&'a (), ())>` for type `for<'a> fn(&'a (), ())`
6-
--> $DIR/associated-type.rs:31:1
6+
--> $DIR/associated-type.rs:32:1
77
|
88
LL | impl<T> Overlap<T> for T {
99
| ------------------------ first implementation here

‎tests/ui/coherence/occurs-check/associated-type.rs

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

45
// A regression test for #105787

‎tests/ui/coherence/occurs-check/opaques.current.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait<_>`
2-
--> $DIR/opaques.rs:27:1
2+
--> $DIR/opaques.rs:28:1
33
|
44
LL | impl<T> Trait<T> for T {
55
| ---------------------- first implementation here

‎tests/ui/coherence/occurs-check/opaques.next.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait<_>`
2-
--> $DIR/opaques.rs:27:1
2+
--> $DIR/opaques.rs:28:1
33
|
44
LL | impl<T> Trait<T> for T {
55
| ---------------------- first implementation here
@@ -8,7 +8,7 @@ LL | impl<T> Trait<T> for defining_scope::Alias<T> {
88
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
99

1010
error[E0282]: type annotations needed
11-
--> $DIR/opaques.rs:10:20
11+
--> $DIR/opaques.rs:11:20
1212
|
1313
LL | pub fn cast<T>(x: Container<Alias<T>, T>) -> Container<T, T> {
1414
| ^ cannot infer type

‎tests/ui/coherence/occurs-check/opaques.rs

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

45
// A regression test for #105787

‎tests/ui/coherence/orphan-check-opaque-types-not-covering.next.stderr

-21
This file was deleted.

‎tests/ui/coherence/orphan-check-opaque-types-not-covering.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Opaque types never cover type parameters.
22

3-
//@ revisions: classic next
4-
//@[next] compile-flags: -Znext-solver
5-
63
//@ aux-crate:foreign=parametrized-trait.rs
74
//@ edition:2021
85

0 commit comments

Comments
 (0)