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-15 22:58:54 +0000
committerbors <bors@rust-lang.org>2020-04-15 22:58:54 +0000
commitce1ab355c27faa84f984b15800cd6a65e674b9f2 (patch)
tree7c2598a80324cd67ec6140f142d7dcdd37974d70 /src/librustc_error_codes/error_codes
parentd2230290f7220e740ec08f4d844bf5951e1b74b8 (diff)
parent41dc51ead81c99764ee82a58fab1328e74fb4f08 (diff)
downloadrust-ce1ab355c27faa84f984b15800cd6a65e674b9f2.tar.gz
rust-ce1ab355c27faa84f984b15800cd6a65e674b9f2.zip
Auto merge of #71180 - Dylan-DPC:rollup-pscpg6q, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #69903 (Do not ICE in the face of invalid enum discriminant)
 - #70354 (Update RELEASES.md for 1.43.0)
 - #70774 (End cleanup on rustdoc-js tools)
 - #70990 (Improve rustdoc source code a bit)
 - #71145 (Add illumos triple)
 - #71166 (Clean up E0518 explanation)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
-rw-r--r--src/librustc_error_codes/error_codes/E0518.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_error_codes/error_codes/E0518.md b/src/librustc_error_codes/error_codes/E0518.md
index 1af9a3735fe..f04329bc4e6 100644
--- a/src/librustc_error_codes/error_codes/E0518.md
+++ b/src/librustc_error_codes/error_codes/E0518.md
@@ -1,7 +1,7 @@
-This error indicates that an `#[inline(..)]` attribute was incorrectly placed
-on something other than a function or method.
+An `#[inline(..)]` attribute was incorrectly placed on something other than a
+function or method.
 
-Examples of erroneous code:
+Example of erroneous code:
 
 ```compile_fail,E0518
 #[inline(always)]