about summary refs log tree commit diff
path: root/src/librustc_error_codes/error_codes.rs
diff options
context:
space:
mode:
authorNathan Corbyn <me@nathancorbyn.com>2020-06-08 11:57:56 +0100
committerNathan Corbyn <me@nathancorbyn.com>2020-06-08 12:00:12 +0100
commita1eeaddf3f7aad9e82196d338613593e4e000762 (patch)
tree5b9c9faa37cbde9d37b6e7fd1195717d0bbf41b6 /src/librustc_error_codes/error_codes.rs
parent73558160933b2764ed9a84b1b2b647e128eac3f8 (diff)
downloadrust-a1eeaddf3f7aad9e82196d338613593e4e000762.tar.gz
rust-a1eeaddf3f7aad9e82196d338613593e4e000762.zip
Resolve E0584 conflict
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 7abe75a375a..a5b896ab19a 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -438,6 +438,7 @@ E0752: include_str!("./error_codes/E0752.md"),
 E0753: include_str!("./error_codes/E0753.md"),
 E0754: include_str!("./error_codes/E0754.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