about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-01-20 11:14:51 +0530
committerGitHub <noreply@github.com>2020-01-20 11:14:51 +0530
commit0259c103853afe4b641a1a3f36ca7daa92c2b0e2 (patch)
tree34bc5482693fb417276dbcb216eb14f82ad952a6
parentcd4652a195ff019481c719a3d66ef4938c20e3d9 (diff)
parenta9aa2dfe844840a7e414873ce55ef9d02f1038a7 (diff)
downloadrust-0259c103853afe4b641a1a3f36ca7daa92c2b0e2.tar.gz
rust-0259c103853afe4b641a1a3f36ca7daa92c2b0e2.zip
Rollup merge of #68365 - GuillaumeGomez:clean-up-err-codes-2, r=Dylan-DPC
Clean up error codes

r? @Dylan-DPC
-rw-r--r--src/librustc_error_codes/error_codes/E0201.md6
-rw-r--r--src/librustc_error_codes/error_codes/E0204.md17
2 files changed, 13 insertions, 10 deletions
diff --git a/src/librustc_error_codes/error_codes/E0201.md b/src/librustc_error_codes/error_codes/E0201.md
index bdbf02f0033..0e1a7b7b7de 100644
--- a/src/librustc_error_codes/error_codes/E0201.md
+++ b/src/librustc_error_codes/error_codes/E0201.md
@@ -1,7 +1,7 @@
-It is an error to define two associated items (like methods, associated types,
-associated functions, etc.) with the same identifier.
+Two associated items (like methods, associated types, associated functions,
+etc.) were defined with the same identifier.
 
-For example:
+Erroneous code example:
 
 ```compile_fail,E0201
 struct Foo(u8);
diff --git a/src/librustc_error_codes/error_codes/E0204.md b/src/librustc_error_codes/error_codes/E0204.md
index 31569011135..96e44758be4 100644
--- a/src/librustc_error_codes/error_codes/E0204.md
+++ b/src/librustc_error_codes/error_codes/E0204.md
@@ -1,21 +1,24 @@
-An attempt to implement the `Copy` trait for a struct failed because one of the
-fields does not implement `Copy`. To fix this, you must implement `Copy` for the
-mentioned field. Note that this may not be possible, as in the example of
+The `Copy` trait was implemented on a type which contains a field that doesn't
+implement the `Copy` trait.
+
+Erroneous code example:
 
 ```compile_fail,E0204
 struct Foo {
-    foo : Vec<u32>,
+    foo: Vec<u32>,
 }
 
-impl Copy for Foo { }
+impl Copy for Foo { } // error!
 ```
 
-This fails because `Vec<T>` does not implement `Copy` for any `T`.
+The `Copy` trait is implemented by default only on primitive types. If your
+type only contains primitive types, you'll be able to implement `Copy` on it.
+Otherwise, it won't be possible.
 
 Here's another example that will fail:
 
 ```compile_fail,E0204
-#[derive(Copy)]
+#[derive(Copy)] // error!
 struct Foo<'a> {
     ty: &'a mut bool,
 }