about summary refs log tree commit diff
path: root/src/librustc_error_codes/error_codes.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-28 17:15:32 +0000
committerbors <bors@rust-lang.org>2020-03-28 17:15:32 +0000
commitc52cee172fcd2e223100d8bdd5e105dc37aaca23 (patch)
tree1dbbe3d2d019f59bf1c2fae6b674096effae9670 /src/librustc_error_codes/error_codes.rs
parente768d6f0bc6db7a46c9ef08254a944ba100bc5dd (diff)
parente3ccd5ba49e9b3811dda14f66e5ca8417b3aa4fb (diff)
downloadrust-c52cee172fcd2e223100d8bdd5e105dc37aaca23.tar.gz
rust-c52cee172fcd2e223100d8bdd5e105dc37aaca23.zip
Auto merge of #70499 - Dylan-DPC:rollup-f9je1l8, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #70418 (Add long error explanation for E0703)
 - #70448 (Create output dir in rustdoc markdown render)
 - #70486 (Shrink Unicode tables (even more))
 - #70493 (Fix rustdoc.css CSS tab-size property)
 - #70495 (Replace last mention of IRC with Discord)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes.rs')
-rw-r--r--src/librustc_error_codes/error_codes.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes.rs b/src/librustc_error_codes/error_codes.rs
index fe68e9eacbf..2f0a3fc1d1c 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -389,6 +389,7 @@ E0698: include_str!("./error_codes/E0698.md"),
 E0699: include_str!("./error_codes/E0699.md"),
 E0700: include_str!("./error_codes/E0700.md"),
 E0701: include_str!("./error_codes/E0701.md"),
+E0703: include_str!("./error_codes/E0703.md"),
 E0704: include_str!("./error_codes/E0704.md"),
 E0705: include_str!("./error_codes/E0705.md"),
 E0706: include_str!("./error_codes/E0706.md"),
@@ -603,7 +604,6 @@ E0751: include_str!("./error_codes/E0751.md"),
 //  E0694, // an unknown tool name found in scoped attributes
     E0696, // `continue` pointing to a labeled block
 //  E0702, // replaced with a generic attribute input check
-    E0703, // invalid ABI
 //  E0707, // multiple elided lifetimes used in arguments of `async fn`
     E0708, // `async` non-`move` closures with parameters are not currently
            // supported