about summary refs log tree commit diff
path: root/src/librustc_error_codes/error_codes
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-08 19:54:57 +0000
committerbors <bors@rust-lang.org>2020-03-08 19:54:57 +0000
commit2cb0b8582ebbf9784db9cec06fff517badbf4553 (patch)
treee9d43ec6f39de515bf629881b438fcd8db31b0af /src/librustc_error_codes/error_codes
parent564758c4c329e89722454dd2fbb35f1ac0b8b47c (diff)
parentc934c94212755eee25e86d9d49fb057073a28b91 (diff)
downloadrust-2cb0b8582ebbf9784db9cec06fff517badbf4553.tar.gz
rust-2cb0b8582ebbf9784db9cec06fff517badbf4553.zip
Auto merge of #69833 - Centril:rollup-mh74yue, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #69120 (Don't give invalid suggestion on desugared span.)
 - #69326 (mir-interpret: add method to read wide strings from Memory)
 - #69608 (Expose target libdir information via print command)
 - #69734 (Change DIBuilderCreateEnumerator signature to match LLVM 9)
 - #69800 (Compile address sanitizer test with debuginfo)
 - #69807 (Cleanup E0391 explanation)
 - #69820 (clean up E0392 explanation)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
-rw-r--r--src/librustc_error_codes/error_codes/E0391.md8
-rw-r--r--src/librustc_error_codes/error_codes/E0392.md5
2 files changed, 8 insertions, 5 deletions
diff --git a/src/librustc_error_codes/error_codes/E0391.md b/src/librustc_error_codes/error_codes/E0391.md
index 5db9ad16d08..dff50ccaa0b 100644
--- a/src/librustc_error_codes/error_codes/E0391.md
+++ b/src/librustc_error_codes/error_codes/E0391.md
@@ -1,7 +1,6 @@
-This error indicates that some types or traits depend on each other
-and therefore cannot be constructed.
+A type dependency cycle has been encountered.
 
-The following example contains a circular dependency between two traits:
+Erroneous code example:
 
 ```compile_fail,E0391
 trait FirstTrait : SecondTrait {
@@ -12,3 +11,6 @@ trait SecondTrait : FirstTrait {
 
 }
 ```
+
+The previous example contains a circular dependency between two traits:
+`FirstTrait` depends on `SecondTrait` which itself depends on `FirstTrait`.
diff --git a/src/librustc_error_codes/error_codes/E0392.md b/src/librustc_error_codes/error_codes/E0392.md
index 1d93e904e37..f373d89456d 100644
--- a/src/librustc_error_codes/error_codes/E0392.md
+++ b/src/librustc_error_codes/error_codes/E0392.md
@@ -1,5 +1,6 @@
-This error indicates that a type or lifetime parameter has been declared
-but not actually used. Here is an example that demonstrates the error:
+A type or lifetime parameter has been declared but is not actually used.
+
+Erroneous code example:
 
 ```compile_fail,E0392
 enum Foo<T> {