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-06-10 00:48:35 +0000
committerbors <bors@rust-lang.org>2020-06-10 00:48:35 +0000
commitbb8674837a9cc5225020e07fc3f164762bb4c11c (patch)
treef94c254be282b464db805e6fa9042266d66c47b9 /src/librustc_error_codes/error_codes.rs
parent283522400b5c13dfdf2b7e608e63a70ee8e3d7af (diff)
parent74380d712d76c8bf48493f751ffda745bf78ecbc (diff)
downloadrust-bb8674837a9cc5225020e07fc3f164762bb4c11c.tar.gz
rust-bb8674837a9cc5225020e07fc3f164762bb4c11c.zip
Auto merge of #73190 - Dylan-DPC:rollup-9wbyh4y, r=Dylan-DPC
Rollup of 8 pull requests

Successful merges:

 - #72417 (Remove `RawVec::reserve_in_place`.)
 - #73098 (Add Item::is_fake for rustdoc)
 - #73122 (Resolve E0584 conflict)
 - #73123 (Clean up E0647 explanation)
 - #73133 (Enforce unwind invariants)
 - #73148 (Fix a typo (size of the size))
 - #73149 (typo: awailable -> available)
 - #73161 (Add mailmap entry)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes.rs')
-rw-r--r--src/librustc_error_codes/error_codes.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_error_codes/error_codes.rs b/src/librustc_error_codes/error_codes.rs
index 760b4d7ba00..ec5b3251e68 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -439,6 +439,7 @@ E0753: include_str!("./error_codes/E0753.md"),
 E0754: include_str!("./error_codes/E0754.md"),
 E0758: include_str!("./error_codes/E0758.md"),
 E0760: include_str!("./error_codes/E0760.md"),
+E0761: include_str!("./error_codes/E0761.md"),
 ;
 //  E0006, // merged with E0005
 //  E0008, // cannot bind by-move into a pattern guard