Skip to content

Commit 7aeb07a

Browse files
committed
remove unnecessary revisions
1 parent d3f982d commit 7aeb07a

File tree

43 files changed

+30
-281
lines changed

Some content is hidden

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

43 files changed

+30
-281
lines changed

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
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 renamed to tests/ui/coherence/coherence-overlap-downstream-inherent.stderr

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
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 renamed to tests/ui/coherence/coherence-overlap-downstream.stderr

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
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 renamed to tests/ui/coherence/coherence-overlap-issue-23516-inherent.stderr

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)