diff options
| author | bors <bors@rust-lang.org> | 2020-06-08 23:52:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-08 23:52:04 +0000 |
| commit | 5d39f1fa2978e2c4532d002f4ce5121bc1c9a007 (patch) | |
| tree | 970a662f7fcdd48e8ae83c33d509278027cc4435 /src/librustc_error_codes/error_codes.rs | |
| parent | fd4b177aabb9749dfb562c48e47379cea81dc277 (diff) | |
| parent | 9890107a813bbda09fc9dab503db25de44b3ad86 (diff) | |
| download | rust-5d39f1fa2978e2c4532d002f4ce5121bc1c9a007.tar.gz rust-5d39f1fa2978e2c4532d002f4ce5121bc1c9a007.zip | |
Auto merge of #73147 - Dylan-DPC:rollup-9saqhj5, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #71842 (doc: make impl block collapsible if it has an associated constant) - #72912 (Add new E0758 error code) - #73008 (Update RELEASES.md) - #73090 (Use `LocalDefId` directly in `Resolver::export_map`) - #73118 (Improve the wording in documentation of std::mem::drop) - #73124 (Removed lifetime parameters from Explanation of E0207 ) - #73138 (Use shorthand linker strip arguments in order to support MacOS) - #73143 (Update books) 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 7abe75a375a..760b4d7ba00 100644 --- a/src/librustc_error_codes/error_codes.rs +++ b/src/librustc_error_codes/error_codes.rs @@ -437,6 +437,7 @@ 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"), +E0758: include_str!("./error_codes/E0758.md"), E0760: include_str!("./error_codes/E0760.md"), ; // E0006, // merged with E0005 |