mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #97627 - lcnr:comment-tick, r=Dylan-DPC

Browse Source 
update explicit impls error msg
This commit is contained in:
Matthias Krüger 2022-06-02 23:39:04 +02:00 committed by GitHub
commit 992ca9b601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_typeck/src/coherence/mod.rs
View File

@ -57,7 +57,7 @@ fn enforce_trait_manually_implementable(
E0322, E0322,
"explicit impls for the `Pointee` trait are not permitted" "explicit impls for the `Pointee` trait are not permitted"
) )
.span_label(span, "impl of 'Pointee' not allowed") .span_label(span, "impl of `Pointee` not allowed")
.emit(); .emit();
return; return;
} }
@ -70,7 +70,7 @@ fn enforce_trait_manually_implementable(
E0322, E0322,
"explicit impls for the `DiscriminantKind` trait are not permitted" "explicit impls for the `DiscriminantKind` trait are not permitted"
) )
.span_label(span, "impl of 'DiscriminantKind' not allowed") .span_label(span, "impl of `DiscriminantKind` not allowed")
.emit(); .emit();
return; return;
} }
@ -83,7 +83,7 @@ fn enforce_trait_manually_implementable(
E0322, E0322,
"explicit impls for the `Sized` trait are not permitted" "explicit impls for the `Sized` trait are not permitted"
) )
.span_label(span, "impl of 'Sized' not allowed") .span_label(span, "impl of `Sized` not allowed")
.emit(); .emit();
return; return;
} }

12
src/test/ui/coherence/coherence-impls-sized.stderr
View File

@ -35,37 +35,37 @@ error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:14:1 --> $DIR/coherence-impls-sized.rs:14:1
| |
LL | impl Sized for TestE {} LL | impl Sized for TestE {}
| ^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error[E0322]: explicit impls for the `Sized` trait are not permitted error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:17:1 --> $DIR/coherence-impls-sized.rs:17:1
| |
LL | impl Sized for MyType {} LL | impl Sized for MyType {}
| ^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error[E0322]: explicit impls for the `Sized` trait are not permitted error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:20:1 --> $DIR/coherence-impls-sized.rs:20:1
| |
LL | impl Sized for (MyType, MyType) {} LL | impl Sized for (MyType, MyType) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error[E0322]: explicit impls for the `Sized` trait are not permitted error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:24:1 --> $DIR/coherence-impls-sized.rs:24:1
| |
LL | impl Sized for &'static NotSync {} LL | impl Sized for &'static NotSync {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error[E0322]: explicit impls for the `Sized` trait are not permitted error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:27:1 --> $DIR/coherence-impls-sized.rs:27:1
| |
LL | impl Sized for [MyType] {} LL | impl Sized for [MyType] {}
| ^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error[E0322]: explicit impls for the `Sized` trait are not permitted error[E0322]: explicit impls for the `Sized` trait are not permitted
--> $DIR/coherence-impls-sized.rs:31:1 --> $DIR/coherence-impls-sized.rs:31:1
| |
LL | impl Sized for &'static [NotSync] {} LL | impl Sized for &'static [NotSync] {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed
error: aborting due to 9 previous errors error: aborting due to 9 previous errors

2
src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr
View File

@ -2,7 +2,7 @@ error[E0322]: explicit impls for the `DiscriminantKind` trait are not permitted
--> $DIR/forbidden-discriminant-kind-impl.rs:9:1 --> $DIR/forbidden-discriminant-kind-impl.rs:9:1
| |
LL | impl DiscriminantKind for NewType { LL | impl DiscriminantKind for NewType {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'DiscriminantKind' not allowed | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `DiscriminantKind` not allowed
error: aborting due to previous error error: aborting due to previous error