Account for tuples in explanation

estebank · estebank · commit db1bfbdbc074 · 2019-10-28T09:57:36.000-07:00
diff --git a/src/librustc_typeck/coherence/orphan.rs b/src/librustc_typeck/coherence/orphan.rs
@@ -54,8 +54,9 @@ impl ItemLikeVisitor<'v> for OrphanChecker<'tcx> {
                             "`{}` is not defined in the current crate{}",
                             ty,
                             match &ty.kind {
-                                ty::Slice(_) => " because slices are always considered foreign",
-                                ty::Array(..) => " because arrays are always considered foreign",
+                                ty::Slice(_) => " because slices are always foreign",
+                                ty::Array(..) => " because arrays are always foreign",
+                                ty::Tuple(..) => " because tuples are always foreign",
                                 _ => "",
                             },
                         );
diff --git a/src/test/ui/coherence/coherence-impls-copy.old.stderr b/src/test/ui/coherence/coherence-impls-copy.old.stderr
@@ -62,7 +62,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^----------------
    | |             |
-   | |             `(MyType, MyType)` is not defined in the current crate
+   | |             `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -73,7 +73,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for [MyType] {}
    | ^^^^^^^^^^^^^^--------
    | |             |
-   | |             `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |             `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -84,7 +84,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^------------------
    | |             |
-   | |             `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |             `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence-impls-copy.re.stderr b/src/test/ui/coherence/coherence-impls-copy.re.stderr
@@ -62,7 +62,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^----------------
    | |             |
-   | |             `(MyType, MyType)` is not defined in the current crate
+   | |             `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -73,7 +73,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for [MyType] {}
    | ^^^^^^^^^^^^^^--------
    | |             |
-   | |             `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |             `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -84,7 +84,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^------------------
    | |             |
-   | |             `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |             `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence-impls-send.old.stderr b/src/test/ui/coherence/coherence-impls-send.old.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^^^^^^^^----------------
    | |                    |
-   | |                    `(MyType, MyType)` is not defined in the current crate
+   | |                    `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -21,7 +21,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for [MyType] {}
    | ^^^^^^^^^^^^^^^^^^^^^--------
    | |                    |
-   | |                    `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |                    `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -32,7 +32,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^^^^^^^^------------------
    | |                    |
-   | |                    `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |                    `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence-impls-send.re.stderr b/src/test/ui/coherence/coherence-impls-send.re.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^^^^^^^^----------------
    | |                    |
-   | |                    `(MyType, MyType)` is not defined in the current crate
+   | |                    `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -21,7 +21,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for [MyType] {}
    | ^^^^^^^^^^^^^^^^^^^^^--------
    | |                    |
-   | |                    `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |                    `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -32,7 +32,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | unsafe impl Send for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^^^^^^^^------------------
    | |                    |
-   | |                    `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |                    `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence-impls-sized.old.stderr b/src/test/ui/coherence/coherence-impls-sized.old.stderr
@@ -40,7 +40,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^^----------------
    | |              |
-   | |              `(MyType, MyType)` is not defined in the current crate
+   | |              `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -51,7 +51,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for [MyType] {}
    | ^^^^^^^^^^^^^^^--------
    | |              |
-   | |              `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |              `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -62,7 +62,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^^------------------
    | |              |
-   | |              `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |              `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence-impls-sized.re.stderr b/src/test/ui/coherence/coherence-impls-sized.re.stderr
@@ -40,7 +40,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^^----------------
    | |              |
-   | |              `(MyType, MyType)` is not defined in the current crate
+   | |              `(MyType, MyType)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -51,7 +51,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for [MyType] {}
    | ^^^^^^^^^^^^^^^--------
    | |              |
-   | |              `[MyType]` is not defined in the current crate because slices are always considered foreign
+   | |              `[MyType]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -62,7 +62,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Sized for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^^------------------
    | |              |
-   | |              `[NotSync]` is not defined in the current crate because slices are always considered foreign
+   | |              `[NotSync]` is not defined in the current crate because slices are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.old.stderr b/src/test/ui/coherence/coherence_local_err_tuple.old.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl lib::MyCopy for (MyType,) { }
    | ^^^^^^^^^^^^^^^^^^^^^---------
    | |                    |
-   | |                    `(MyType,)` is not defined in the current crate
+   | |                    `(MyType,)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/coherence_local_err_tuple.re.stderr b/src/test/ui/coherence/coherence_local_err_tuple.re.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl lib::MyCopy for (MyType,) { }
    | ^^^^^^^^^^^^^^^^^^^^^---------
    | |                    |
-   | |                    `(MyType,)` is not defined in the current crate
+   | |                    `(MyType,)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/error-codes/E0206.stderr b/src/test/ui/error-codes/E0206.stderr
@@ -16,7 +16,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl Copy for Foo { }
    | ^^^^^^^^^^^^^^---
    | |             |
-   | |             `[u8; _]` is not defined in the current crate because arrays are always considered foreign
+   | |             `[u8; _]` is not defined in the current crate because arrays are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl DefaultedTrait for (A,) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^----
    | |                       |
-   | |                       `(A,)` is not defined in the current crate
+   | |                       `(A,)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -15,7 +15,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
 LL | impl !DefaultedTrait for (B,) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^----
    | |                        |
-   | |                        `(B,)` is not defined in the current crate
+   | |                        `(B,)` is not defined in the current crate because tuples are always foreign
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar`
`4`	`4`	`LL \| impl lib::MyCopy for (MyType,) { }`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^---------`
`6`	`6`	`\| \| \|`
`7`		- \| \| `(MyType,)` is not defined in the current crate
	`7`	+ \| \| `(MyType,)` is not defined in the current crate because tuples are always foreign
`8`	`8`	`\| impl doesn't use only types from inside the current crate`
`9`	`9`	`\|`
`10`	`10`	`= note: define and implement a trait or new type instead`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar`
`16`	`16`	`LL \| impl Copy for Foo { }`
`17`	`17`	`\| ^^^^^^^^^^^^^^---`
`18`	`18`	`\| \| \|`
`19`		- \| \| `[u8; _]` is not defined in the current crate because arrays are always considered foreign
	`19`	+ \| \| `[u8; _]` is not defined in the current crate because arrays are always foreign
`20`	`20`	`\| impl doesn't use only types from inside the current crate`
`21`	`21`	`\|`
`22`	`22`	`= note: define and implement a trait or new type instead`