diff options
| author | bors <bors@rust-lang.org> | 2020-04-21 01:26:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-21 01:26:56 +0000 |
| commit | 073744f554cf170942aa43893f292199ad44e3d4 (patch) | |
| tree | 7460d5414cb1ed93377e6effe1f8d724c8c4d7dd /src/librustc_error_codes/error_codes.rs | |
| parent | 20fc02f836f3035b86b56a7cedb97c5cd4ed9612 (diff) | |
| parent | 9a0e7029062fb74a71a200b1f7ce0c212c9ea3a6 (diff) | |
Auto merge of #71367 - Dylan-DPC:rollup-ysj4olr, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #69362 (Stabilize most common subset of alloc_layout_extras) - #71174 (Check that main/start is not async) - #71285 (MIR: use HirId instead of NodeId to avoid cycles while inlining) - #71346 (Do not build tools if user do not want them) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes.rs')
| -rw-r--r-- | src/librustc_error_codes/error_codes.rs | 1 |
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 225ede851b4..bc04809eaa1 100644 --- a/src/librustc_error_codes/error_codes.rs +++ b/src/librustc_error_codes/error_codes.rs @@ -431,6 +431,7 @@ E0748: include_str!("./error_codes/E0748.md"), E0749: include_str!("./error_codes/E0749.md"), E0750: include_str!("./error_codes/E0750.md"), E0751: include_str!("./error_codes/E0751.md"), +E0752: include_str!("./error_codes/E0752.md"), ; // E0006, // merged with E0005 // E0008, // cannot bind by-move into a pattern guard |