Skip to content

Commit 6caa4ce

Browse files
committed
Add missing files
1 parent da08a81 commit 6caa4ce

File tree

100 files changed

+1008
-127
lines changed

Some content is hidden

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

100 files changed

+1008
-127
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
2+
pub trait Backend{}
3+
pub trait SupportsDefaultKeyword {}
4+
5+
impl SupportsDefaultKeyword for Postgres {}
6+
7+
pub struct Postgres;
8+
9+
impl Backend for Postgres {}
10+
11+
pub struct AstPass<DB>(::std::marker::PhantomData<DB>);
12+
13+
pub trait QueryFragment<DB: Backend> {}
14+
15+
16+
#[derive(Debug, Clone, Copy)]
17+
pub struct BatchInsert<'a, T: 'a, Tab> {
18+
_marker: ::std::marker::PhantomData<(&'a T, Tab)>,
19+
}
20+
21+
impl<'a, T:'a, Tab, DB> QueryFragment<DB> for BatchInsert<'a, T, Tab>
22+
where DB: SupportsDefaultKeyword + Backend,
23+
{}

src/test/ui/coherence/coherence-all-remote.stderr renamed to src/test/ui/coherence/coherence-all-remote.old.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2-
--> $DIR/coherence-all-remote.rs:6:1
2+
--> $DIR/coherence-all-remote.rs:9:1
33
|
44
LL | impl<T> Remote1<T> for isize { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2+
--> $DIR/coherence-all-remote.rs:9:1
3+
|
4+
LL | impl<T> Remote1<T> for isize { }
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
6+
|
7+
= note: only traits defined in the current crate can be implemented for a type parameter
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0210`.

src/test/ui/coherence/coherence-bigint-param.stderr renamed to src/test/ui/coherence/coherence-bigint-param.old.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2-
--> $DIR/coherence-bigint-param.rs:8:1
2+
--> $DIR/coherence-bigint-param.rs:11:1
33
|
44
LL | impl<T> Remote1<BigInt> for T { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2+
--> $DIR/coherence-bigint-param.rs:11:1
3+
|
4+
LL | impl<T> Remote1<BigInt> for T { }
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
6+
|
7+
= note: only traits defined in the current crate can be implemented for a type parameter
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0210`.

src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr renamed to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.old.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0119]: conflicting implementations of trait `MyTrait`:
2-
--> $DIR/coherence-blanket-conflicts-with-blanket-implemented.rs:24:1
2+
--> $DIR/coherence-blanket-conflicts-with-blanket-implemented.rs:28:1
33
|
44
LL | impl<T:Even> MyTrait for T {
55
| -------------------------- first implementation here
66
...
7-
LL | impl<T:Odd> MyTrait for T { //~ ERROR E0119
7+
LL | impl<T:Odd> MyTrait for T {
88
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
99

1010
error: aborting due to previous error
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0119]: conflicting implementations of trait `MyTrait`:
2+
--> $DIR/coherence-blanket-conflicts-with-blanket-implemented.rs:28:1
3+
|
4+
LL | impl<T:Even> MyTrait for T {
5+
| -------------------------- first implementation here
6+
...
7+
LL | impl<T:Odd> MyTrait for T {
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
9+
10+
error: aborting due to previous error
11+
12+
For more information about this error, try `rustc --explain E0119`.

src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr renamed to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.old.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0119]: conflicting implementations of trait `MyTrait`:
2-
--> $DIR/coherence-blanket-conflicts-with-blanket-unimplemented.rs:20:1
2+
--> $DIR/coherence-blanket-conflicts-with-blanket-unimplemented.rs:24:1
33
|
44
LL | impl<T:Even> MyTrait for T {
55
| -------------------------- first implementation here
66
...
7-
LL | impl<T:Odd> MyTrait for T { //~ ERROR E0119
7+
LL | impl<T:Odd> MyTrait for T {
88
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
99

1010
error: aborting due to previous error
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0119]: conflicting implementations of trait `MyTrait`:
2+
--> $DIR/coherence-blanket-conflicts-with-blanket-unimplemented.rs:24:1
3+
|
4+
LL | impl<T:Even> MyTrait for T {
5+
| -------------------------- first implementation here
6+
...
7+
LL | impl<T:Odd> MyTrait for T {
8+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
9+
10+
error: aborting due to previous error
11+
12+
For more information about this error, try `rustc --explain E0119`.

src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr renamed to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.old.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0119]: conflicting implementations of trait `go_trait::GoMut` for type `MyThingy`:
2-
--> $DIR/coherence-blanket-conflicts-with-specific-cross-crate.rs:15:1
2+
--> $DIR/coherence-blanket-conflicts-with-specific-cross-crate.rs:18:1
33
|
4-
LL | impl GoMut for MyThingy { //~ ERROR conflicting implementations
4+
LL | impl GoMut for MyThingy {
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: conflicting implementation in crate `go_trait`:

0 commit comments

Comments
 (0)