diff options
| author | bors <bors@rust-lang.org> | 2019-12-24 03:40:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-24 03:40:33 +0000 |
| commit | 625375400cdd172877e81c3ce44ce68f2011af2d (patch) | |
| tree | 2c80e84603e8cc5e868fe94406e6661baca703c0 /src/librustc_error_codes/error_codes.rs | |
| parent | a4cd03dee2b57216b5c95084a0b46de130946ad7 (diff) | |
| parent | a76d67f22f08abf355a1b6abd22b8e2b7db700eb (diff) | |
| download | rust-625375400cdd172877e81c3ce44ce68f2011af2d.tar.gz rust-625375400cdd172877e81c3ce44ce68f2011af2d.zip | |
Auto merge of #67575 - Centril:rollup-feikoir, r=Centril
Rollup of 7 pull requests Successful merges: - #67337 (Ensure that evaluating or validating a constant never reads from a static) - #67543 (Add regression tests for fixed ICEs) - #67547 (Cleanup err codes) - #67551 (Add long error code explanation message for E0627) - #67561 (remove `description` from `Error` impls in docs) - #67569 (Clean up unsafety in char::encode_utf8) - #67572 (Use the chocolatey CDN directly to avoid the flaky API) 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 9c1bec39b29..fbcc976bd49 100644 --- a/src/librustc_error_codes/error_codes.rs +++ b/src/librustc_error_codes/error_codes.rs @@ -346,6 +346,7 @@ E0622: include_str!("./error_codes/E0622.md"), 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"), E0631: include_str!("./error_codes/E0631.md"), E0633: include_str!("./error_codes/E0633.md"), E0635: include_str!("./error_codes/E0635.md"), @@ -574,7 +575,6 @@ E0745: include_str!("./error_codes/E0745.md"), // E0612, // merged into E0609 // E0613, // Removed (merged with E0609) E0625, // thread-local statics cannot be accessed at compile-time - E0627, // yield statement outside of generator literal E0628, // generators cannot have explicit parameters E0629, // missing 'feature' (rustc_const_unstable) // rustc_const_unstable attribute must be paired with stable/unstable |