diff options
| author | bors <bors@rust-lang.org> | 2020-03-16 13:22:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-16 13:22:56 +0000 |
| commit | 59f4ba95045e91a63e921e0d736242d7e1ffabec (patch) | |
| tree | c094dea10880b240fb45bf36cb8f4905edfdb2fa /src/librustc_error_codes/error_codes.rs | |
| parent | 8e6de3244cd62cbde367c206bc9972daded5281d (diff) | |
| parent | d8dbb3c0413afe1cad58515295273c89d82176e5 (diff) | |
| download | rust-59f4ba95045e91a63e921e0d736242d7e1ffabec.tar.gz rust-59f4ba95045e91a63e921e0d736242d7e1ffabec.zip | |
Auto merge of #70040 - Dylan-DPC:rollup-id1k6lz, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #67335 (Refactor the `Qualif` trait) - #69122 (Backtrace Debug tweaks) - #69520 (Make error message clearer about creating new module) - #69738 (More Method -> AssocFn renaming) - #69867 (Add long error explanation for E0628 ) - #69989 (resolve/hygiene: `macro_rules` are not "legacy") - #70036 (Make article_and_description primarily use def_kind) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes.rs')
| -rw-r--r-- | src/librustc_error_codes/error_codes.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes.rs b/src/librustc_error_codes/error_codes.rs index 59a030bc4c6..85339ab9aa1 100644 --- a/src/librustc_error_codes/error_codes.rs +++ b/src/librustc_error_codes/error_codes.rs @@ -349,6 +349,7 @@ E0623: include_str!("./error_codes/E0623.md"), E0624: include_str!("./error_codes/E0624.md"), E0626: include_str!("./error_codes/E0626.md"), E0627: include_str!("./error_codes/E0627.md"), +E0628: include_str!("./error_codes/E0628.md"), E0631: include_str!("./error_codes/E0631.md"), E0633: include_str!("./error_codes/E0633.md"), E0634: include_str!("./error_codes/E0634.md"), @@ -583,7 +584,6 @@ E0748: include_str!("./error_codes/E0748.md"), // E0612, // merged into E0609 // E0613, // Removed (merged with E0609) E0625, // thread-local statics cannot be accessed at compile-time - E0628, // generators cannot have explicit parameters E0629, // missing 'feature' (rustc_const_unstable) // rustc_const_unstable attribute must be paired with stable/unstable // attribute |