diff options
| author | bors <bors@rust-lang.org> | 2022-06-13 01:45:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-13 01:45:16 +0000 |
| commit | c570ab5a0bc2d5a553d0eeaa9923a1c05c84e64e (patch) | |
| tree | f8f68f6a131b50412e5c537ba0ae76e530de0210 /compiler/rustc_error_codes/src | |
| parent | 1fb9603022fe20814d3b7980a3c88299b8e1f747 (diff) | |
| parent | ac73b19a7319148eef71e54ba1c8ac5d7f98b5d5 (diff) | |
| download | rust-c570ab5a0bc2d5a553d0eeaa9923a1c05c84e64e.tar.gz rust-c570ab5a0bc2d5a553d0eeaa9923a1c05c84e64e.zip | |
Auto merge of #98037 - compiler-errors:rollup-fbvy456, r=compiler-errors
Rollup of 3 pull requests Successful merges: - #97920 (Fix some test annotations) - #97950 (Clarify `#[derive(PartialEq)]` on enums) - #98011 (Add documentation for error E0208) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes.rs b/compiler/rustc_error_codes/src/error_codes.rs index 0114461e388..d507293ccb0 100644 --- a/compiler/rustc_error_codes/src/error_codes.rs +++ b/compiler/rustc_error_codes/src/error_codes.rs @@ -528,7 +528,7 @@ E0788: include_str!("./error_codes/E0788.md"), // E0190, // deprecated: can only cast a &-pointer to an &-object // E0194, // merged into E0403 // E0196, // cannot determine a type for this closure - E0208, + E0208, // internal error code // E0209, // builtin traits can only be implemented on structs or enums // E0213, // associated types are not accepted in this context // E0215, // angle-bracket notation is not stable with `Fn` @@ -633,14 +633,14 @@ E0788: include_str!("./error_codes/E0788.md"), // E0629, // missing 'feature' (rustc_const_unstable) // E0630, // rustc_const_unstable attribute must be paired with stable/unstable // attribute - E0640, // infer outlives requirements + E0640, // infer outlives requirements, internal error code // E0645, // trait aliases not finished // E0694, // an unknown tool name found in scoped attributes // E0702, // replaced with a generic attribute input check // E0707, // multiple elided lifetimes used in arguments of `async fn` // E0709, // multiple different lifetimes used in arguments of `async fn` - E0711, // a feature has been declared with conflicting stability attributes - E0717, // rustc_promotable without stability attribute + E0711, // a feature has been declared with conflicting stability attributes, internal error code + E0717, // rustc_promotable without stability attribute, internal error code // E0721, // `await` keyword // E0723, // unstable feature in `const` context // E0738, // Removed; errored on `#[track_caller] fn`s in `extern "Rust" { ... }`. |
