Skip to content

Commit 1fa2932

Browse files
pietroalbinipietroalbini
authored
Rollup merge of rust-lang#57412 - JohnTitor:improve-the-wording-1, r=varkor
Improve the wording I'm sorry but re-opened the PR because I failed to squash commits(rust-lang#57397). Fixes rust-lang#55752. r? @varkor
2 parents 13df6cd + 6a790d3 commit 1fa2932

28 files changed

+46
-46
lines changed

‎src/librustc_typeck/coherence/orphan.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl<'cx, 'tcx, 'v> ItemLikeVisitor<'v> for OrphanChecker<'cx, 'tcx> {
4040
"only traits defined in the current crate can be \
4141
implemented for arbitrary types")
4242
.span_label(sp, "impl doesn't use types inside crate")
43-
.note("the impl does not reference any types defined in this crate")
43+
.note("the impl does not reference only types defined in this crate")
4444
.note("define and implement a trait or new type instead")
4545
.emit();
4646
return;

‎src/test/ui/coherence/coherence-cow.re_a.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | impl<T> Remote for Pair<T,Cover<T>> { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error: aborting due to previous error

‎src/test/ui/coherence/coherence-cow.re_b.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | impl<T> Remote for Pair<Cover<T>,T> { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error: aborting due to previous error

‎src/test/ui/coherence/coherence-cow.re_c.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | impl<T,U> Remote for Pair<Cover<T>,U> { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error: aborting due to previous error

‎src/test/ui/coherence/coherence-fundamental-trait-objects.old.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | impl Misc for dyn Fundamental<Local> {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error: aborting due to previous error

‎src/test/ui/coherence/coherence-fundamental-trait-objects.re.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | impl Misc for dyn Fundamental<Local> {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error: aborting due to previous error

‎src/test/ui/coherence/coherence-impls-copy.old.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
5151
LL | impl Copy for i32 {}
5252
| ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
5353
|
54-
= note: the impl does not reference any types defined in this crate
54+
= note: the impl does not reference only types defined in this crate
5555
= note: define and implement a trait or new type instead
5656

5757
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -60,7 +60,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
6060
LL | impl Copy for (MyType, MyType) {}
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
6262
|
63-
= note: the impl does not reference any types defined in this crate
63+
= note: the impl does not reference only types defined in this crate
6464
= note: define and implement a trait or new type instead
6565

6666
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -69,7 +69,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
6969
LL | impl Copy for [MyType] {}
7070
| ^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
7171
|
72-
= note: the impl does not reference any types defined in this crate
72+
= note: the impl does not reference only types defined in this crate
7373
= note: define and implement a trait or new type instead
7474

7575
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -78,7 +78,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
7878
LL | impl Copy for &'static [NotSync] {}
7979
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
8080
|
81-
= note: the impl does not reference any types defined in this crate
81+
= note: the impl does not reference only types defined in this crate
8282
= note: define and implement a trait or new type instead
8383

8484
error: aborting due to 10 previous errors

‎src/test/ui/coherence/coherence-impls-copy.re.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
5151
LL | impl Copy for i32 {}
5252
| ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
5353
|
54-
= note: the impl does not reference any types defined in this crate
54+
= note: the impl does not reference only types defined in this crate
5555
= note: define and implement a trait or new type instead
5656

5757
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -60,7 +60,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
6060
LL | impl Copy for (MyType, MyType) {}
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
6262
|
63-
= note: the impl does not reference any types defined in this crate
63+
= note: the impl does not reference only types defined in this crate
6464
= note: define and implement a trait or new type instead
6565

6666
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -69,7 +69,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
6969
LL | impl Copy for [MyType] {}
7070
| ^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
7171
|
72-
= note: the impl does not reference any types defined in this crate
72+
= note: the impl does not reference only types defined in this crate
7373
= note: define and implement a trait or new type instead
7474

7575
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -78,7 +78,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
7878
LL | impl Copy for &'static [NotSync] {}
7979
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
8080
|
81-
= note: the impl does not reference any types defined in this crate
81+
= note: the impl does not reference only types defined in this crate
8282
= note: define and implement a trait or new type instead
8383

8484
error: aborting due to 10 previous errors

‎src/test/ui/coherence/coherence-impls-send.old.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | unsafe impl Send for (MyType, MyType) {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static NotSync`
@@ -19,7 +19,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
1919
LL | unsafe impl Send for [MyType] {}
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
2121
|
22-
= note: the impl does not reference any types defined in this crate
22+
= note: the impl does not reference only types defined in this crate
2323
= note: define and implement a trait or new type instead
2424

2525
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -28,7 +28,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
2828
LL | unsafe impl Send for &'static [NotSync] {}
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
3030
|
31-
= note: the impl does not reference any types defined in this crate
31+
= note: the impl does not reference only types defined in this crate
3232
= note: define and implement a trait or new type instead
3333

3434
error: aborting due to 4 previous errors

‎src/test/ui/coherence/coherence-impls-send.re.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
44
LL | unsafe impl Send for (MyType, MyType) {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
66
|
7-
= note: the impl does not reference any types defined in this crate
7+
= note: the impl does not reference only types defined in this crate
88
= note: define and implement a trait or new type instead
99

1010
error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static NotSync`
@@ -19,7 +19,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
1919
LL | unsafe impl Send for [MyType] {}
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
2121
|
22-
= note: the impl does not reference any types defined in this crate
22+
= note: the impl does not reference only types defined in this crate
2323
= note: define and implement a trait or new type instead
2424

2525
error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
@@ -28,7 +28,7 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
2828
LL | unsafe impl Send for &'static [NotSync] {}
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
3030
|
31-
= note: the impl does not reference any types defined in this crate
31+
= note: the impl does not reference only types defined in this crate
3232
= note: define and implement a trait or new type instead
3333

3434
error: aborting due to 4 previous errors

0 commit comments

Comments
 (0)