about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-02-22 18:43:03 +0530
committerGitHub <noreply@github.com>2020-02-22 18:43:03 +0530
commit1cb9fb5e166bc02cf57fcb7228bc87c34cf04562 (patch)
tree9327c51154c7daace84afaa4ece7525819f317c7 /src
parent3d9b68a5c3dec6881ac788a8853c5f052c28d9a0 (diff)
parent8f3fcec351fcc24aba462f200c60dd712592b64d (diff)
downloadrust-1cb9fb5e166bc02cf57fcb7228bc87c34cf04562.tar.gz
rust-1cb9fb5e166bc02cf57fcb7228bc87c34cf04562.zip
Rollup merge of #69346 - GuillaumeGomez:clean-up-e032x-explanations, r=Dylan-DPC
Clean up E0323, E0324, E0325 and E0326 explanations

r? @Dylan-DPC
Diffstat (limited to 'src')
-rw-r--r--src/librustc_error_codes/error_codes/E0323.md1
-rw-r--r--src/librustc_error_codes/error_codes/E0324.md5
-rw-r--r--src/librustc_error_codes/error_codes/E0325.md1
-rw-r--r--src/librustc_error_codes/error_codes/E0326.md8
4 files changed, 10 insertions, 5 deletions
diff --git a/src/librustc_error_codes/error_codes/E0323.md b/src/librustc_error_codes/error_codes/E0323.md
index 6d34c35f9cb..0bf42d17ebc 100644
--- a/src/librustc_error_codes/error_codes/E0323.md
+++ b/src/librustc_error_codes/error_codes/E0323.md
@@ -1,4 +1,5 @@
 An associated const was implemented when another trait item was expected.
+
 Erroneous code example:
 
 ```compile_fail,E0323
diff --git a/src/librustc_error_codes/error_codes/E0324.md b/src/librustc_error_codes/error_codes/E0324.md
index b8c9e596990..1442cb77dd9 100644
--- a/src/librustc_error_codes/error_codes/E0324.md
+++ b/src/librustc_error_codes/error_codes/E0324.md
@@ -1,5 +1,6 @@
-A method was implemented when another trait item was expected. Erroneous
-code example:
+A method was implemented when another trait item was expected.
+
+Erroneous code example:
 
 ```compile_fail,E0324
 struct Bar;
diff --git a/src/librustc_error_codes/error_codes/E0325.md b/src/librustc_error_codes/error_codes/E0325.md
index f685b92cbf0..656fd1ec82b 100644
--- a/src/librustc_error_codes/error_codes/E0325.md
+++ b/src/librustc_error_codes/error_codes/E0325.md
@@ -1,4 +1,5 @@
 An associated type was implemented when another trait item was expected.
+
 Erroneous code example:
 
 ```compile_fail,E0325
diff --git a/src/librustc_error_codes/error_codes/E0326.md b/src/librustc_error_codes/error_codes/E0326.md
index 0702d00c2de..3d357819c7f 100644
--- a/src/librustc_error_codes/error_codes/E0326.md
+++ b/src/librustc_error_codes/error_codes/E0326.md
@@ -1,7 +1,6 @@
-The types of any associated constants in a trait implementation must match the
-types in the trait definition. This error indicates that there was a mismatch.
+An implementation of a trait doesn't match the type contraint.
 
-Here's an example of this error:
+Erroneous code example:
 
 ```compile_fail,E0326
 trait Foo {
@@ -14,3 +13,6 @@ impl Foo for Bar {
     const BAR: u32 = 5; // error, expected bool, found u32
 }
 ```
+
+The types of any associated constants in a trait implementation must match the
+types in the trait definition.