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-04-19 13:24:05 +0000
committerbors <bors@rust-lang.org>2020-04-19 13:24:05 +0000
commit1b7dec9e449bb00c7901577abbded39738652b51 (patch)
treef908f092b07ee3843882e6a3687ed6636cfbccd1 /src/librustc_error_codes/error_codes
parent36b1a9296cde2b773771710e9bbd608fd2eca35f (diff)
parent1d2532bdf623772c0596166c31df98374d7c6af6 (diff)
downloadrust-1b7dec9e449bb00c7901577abbded39738652b51.tar.gz
rust-1b7dec9e449bb00c7901577abbded39738652b51.zip
Auto merge of #71326 - Dylan-DPC:rollup-hdlkdj5, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #71107 (Address concerns of weak-into-raw)
 - #71188 (Fixed missing trait method suggests incorrect code (self parameter not named "self"). )
 - #71300 (Clarify when to use the tracking issue template)
 - #71315 (Add example in the alternative in std::mem::transmute docs)
 - #71319 (Clean up E0522 explanation)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
-rw-r--r--src/librustc_error_codes/error_codes/E0522.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/librustc_error_codes/error_codes/E0522.md b/src/librustc_error_codes/error_codes/E0522.md
index e4756c384c4..83272314a87 100644
--- a/src/librustc_error_codes/error_codes/E0522.md
+++ b/src/librustc_error_codes/error_codes/E0522.md
@@ -1,7 +1,5 @@
-The lang attribute is intended for marking special items that are built-in to
-Rust itself. This includes special traits (like `Copy` and `Sized`) that affect
-how the compiler behaves, as well as special functions that may be automatically
-invoked (such as the handler for out-of-bounds accesses when indexing a slice).
+The lang attribute was used in an invalid context.
+
 Erroneous code example:
 
 ```compile_fail,E0522
@@ -12,3 +10,8 @@ fn cookie() -> ! { // error: definition of an unknown language item: `cookie`
     loop {}
 }
 ```
+
+The lang attribute is intended for marking special items that are built-in to
+Rust itself. This includes special traits (like `Copy` and `Sized`) that affect
+how the compiler behaves, as well as special functions that may be automatically
+invoked (such as the handler for out-of-bounds accesses when indexing a slice).