about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Howell <michael@notriddle.com>2021-08-31 08:52:19 -0700
committerMichael Howell <michael@notriddle.com>2021-08-31 08:53:23 -0700
commit6e70678f7d93ad777297c865e35e005520a4eefb (patch)
treec207183ae8c41be39414d713a3860bfc53eff403
parent435cdd0f9ab2cb02bb475415279f9542efa449a1 (diff)
downloadrust-6e70678f7d93ad777297c865e35e005520a4eefb.tar.gz
rust-6e70678f7d93ad777297c865e35e005520a4eefb.zip
Change wording to less jaron-y "non-auto trait"
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
-rw-r--r--compiler/rustc_typeck/src/coherence/inherent_impls.rs2
-rw-r--r--src/test/ui/coherence/issue-85026.stderr4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_typeck/src/coherence/inherent_impls.rs b/compiler/rustc_typeck/src/coherence/inherent_impls.rs
index 05d7dfb9c8f..c7be9e21235 100644
--- a/compiler/rustc_typeck/src/coherence/inherent_impls.rs
+++ b/compiler/rustc_typeck/src/coherence/inherent_impls.rs
@@ -67,7 +67,7 @@ impl ItemLikeVisitor<'v> for InherentCollect<'tcx> {
                     E0785,
                     "cannot define inherent `impl` for a dyn auto trait"
                 )
-                .span_label(ty.span, "impl requires a principal trait")
+                .span_label(ty.span, "impl requires at least one non-auto trait")
                 .note("define and implement a new trait or type instead")
                 .emit();
             }
diff --git a/src/test/ui/coherence/issue-85026.stderr b/src/test/ui/coherence/issue-85026.stderr
index cf9cd52d2bf..a5da19bbfaa 100644
--- a/src/test/ui/coherence/issue-85026.stderr
+++ b/src/test/ui/coherence/issue-85026.stderr
@@ -2,7 +2,7 @@ error[E0785]: cannot define inherent `impl` for a dyn auto trait
   --> $DIR/issue-85026.rs:5:6
    |
 LL | impl dyn AutoTrait {}
-   |      ^^^^^^^^^^^^^ impl requires a principal trait
+   |      ^^^^^^^^^^^^^ impl requires at least one non-auto trait
    |
    = note: define and implement a new trait or type instead
 
@@ -10,7 +10,7 @@ error[E0785]: cannot define inherent `impl` for a dyn auto trait
   --> $DIR/issue-85026.rs:8:6
    |
 LL | impl dyn Unpin {}
-   |      ^^^^^^^^^ impl requires a principal trait
+   |      ^^^^^^^^^ impl requires at least one non-auto trait
    |
    = note: define and implement a new trait or type instead