diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-06-02 23:39:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 23:39:04 +0200 |
| commit | 992ca9b601c7ebc895c1fe3698077fafaa946548 (patch) | |
| tree | a0509d8ea300f742d79a12293d7de7ec8635ff77 | |
| parent | ba54e75b55458c80a245c45424f58550456d3eb7 (diff) | |
| parent | 79c3011d9d1b5f4d1ebd1243d10f4f4a4296a2ee (diff) | |
| download | rust-992ca9b601c7ebc895c1fe3698077fafaa946548.tar.gz rust-992ca9b601c7ebc895c1fe3698077fafaa946548.zip | |
Rollup merge of #97627 - lcnr:comment-tick, r=Dylan-DPC
update explicit impls error msg
| -rw-r--r-- | compiler/rustc_typeck/src/coherence/mod.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/coherence/coherence-impls-sized.stderr | 12 | ||||
| -rw-r--r-- | src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/compiler/rustc_typeck/src/coherence/mod.rs b/compiler/rustc_typeck/src/coherence/mod.rs index 3f1b4828d1a..3903448a007 100644 --- a/compiler/rustc_typeck/src/coherence/mod.rs +++ b/compiler/rustc_typeck/src/coherence/mod.rs @@ -57,7 +57,7 @@ fn enforce_trait_manually_implementable( E0322, "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(); return; } @@ -70,7 +70,7 @@ fn enforce_trait_manually_implementable( E0322, "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(); return; } @@ -83,7 +83,7 @@ fn enforce_trait_manually_implementable( E0322, "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(); return; } diff --git a/src/test/ui/coherence/coherence-impls-sized.stderr b/src/test/ui/coherence/coherence-impls-sized.stderr index 9cf5ed38c9c..e1e4acd4cd8 100644 --- a/src/test/ui/coherence/coherence-impls-sized.stderr +++ b/src/test/ui/coherence/coherence-impls-sized.stderr @@ -35,37 +35,37 @@ error[E0322]: explicit impls for the `Sized` trait are not permitted --> $DIR/coherence-impls-sized.rs:14:1 | 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 --> $DIR/coherence-impls-sized.rs:17:1 | 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 --> $DIR/coherence-impls-sized.rs:20:1 | 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 --> $DIR/coherence-impls-sized.rs:24:1 | 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 --> $DIR/coherence-impls-sized.rs:27:1 | 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 --> $DIR/coherence-impls-sized.rs:31:1 | LL | impl Sized for &'static [NotSync] {} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'Sized' not allowed + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `Sized` not allowed error: aborting due to 9 previous errors diff --git a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr b/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr index 54360c4f47b..38cfd13b9b8 100644 --- a/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr +++ b/src/test/ui/enum-discriminant/forbidden-discriminant-kind-impl.stderr @@ -2,7 +2,7 @@ error[E0322]: explicit impls for the `DiscriminantKind` trait are not permitted --> $DIR/forbidden-discriminant-kind-impl.rs:9:1 | LL | impl DiscriminantKind for NewType { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of 'DiscriminantKind' not allowed + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl of `DiscriminantKind` not allowed error: aborting due to previous error |