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-05-17 16:20:19 +0000
committerbors <bors@rust-lang.org>2020-05-17 16:20:19 +0000
commitd79f1bd31a1401b5d08096fcdf9a9eb23ddf95df (patch)
tree3f05098e7dc5e8c5b27b9d2bf6d5e7e91150806c /src/librustc_error_codes/error_codes.rs
parent34cce58d81f006a5406fcae918db4492e6cf2784 (diff)
parent2b3d99d31a0660645cfd338895209da5616a84af (diff)
downloadrust-d79f1bd31a1401b5d08096fcdf9a9eb23ddf95df.tar.gz
rust-d79f1bd31a1401b5d08096fcdf9a9eb23ddf95df.zip
Auto merge of #72295 - RalfJung:rollup-icmhbs7, r=RalfJung
Rollup of 3 pull requests

Successful merges:

 - #72259 (Disallow forbidden usage of non-ascii identifiers.)
 - #72261 (Break out early on empty span when generate_fn_span)
 - #72291 (bootstrap: fix typo)

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 2399e99a309..d6863c615f6 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -436,6 +436,7 @@ E0750: include_str!("./error_codes/E0750.md"),
 E0751: include_str!("./error_codes/E0751.md"),
 E0752: include_str!("./error_codes/E0752.md"),
 E0753: include_str!("./error_codes/E0753.md"),
+E0754: include_str!("./error_codes/E0754.md"),
 ;
 //  E0006, // merged with E0005
 //  E0008, // cannot bind by-move into a pattern guard