diff options
| author | bors <bors@rust-lang.org> | 2023-01-12 17:11:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-12 17:11:03 +0000 |
| commit | 1bc3683b3275a5eb2ed13d24edcdcbc59afe5d70 (patch) | |
| tree | 45a2cd6613ff1e78a0a43ffb8e665b41df71bcec /compiler/rustc_error_codes/src | |
| parent | 222d1ff68d5bfe1dc2d7f3f0c42811fe12964af9 (diff) | |
| parent | 89f9569d54452bb0b93f75aaee720c487ed2b37a (diff) | |
| download | rust-1bc3683b3275a5eb2ed13d24edcdcbc59afe5d70.tar.gz rust-1bc3683b3275a5eb2ed13d24edcdcbc59afe5d70.zip | |
Auto merge of #106773 - Nilstrieb:rollup-sq73pyg, r=Nilstrieb
Rollup of 6 pull requests Successful merges: - #105806 (Support eager subdiagnostics again) - #106322 (Handle inference variables in `CollectAllMismatches` correctly) - #106579 (Suggest making private tuple struct field public) - #106714 (remove unreachable error code `E0490`) - #106751 (Fix rendering 'const' in header for intrinsics) - #106761 (Add `WaffleLapkin` to compiler reviewers) 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes.rs b/compiler/rustc_error_codes/src/error_codes.rs index a132a8146e9..24258974bb9 100644 --- a/compiler/rustc_error_codes/src/error_codes.rs +++ b/compiler/rustc_error_codes/src/error_codes.rs @@ -618,7 +618,7 @@ E0791: include_str!("./error_codes/E0791.md"), // E0487, // unsafe use of destructor: destructor might be called while... // E0488, // lifetime of variable does not enclose its declaration // E0489, // type/lifetime parameter not in scope here - E0490, // a value of type `..` is borrowed for too long +// E0490, // removed: unreachable E0523, // two dependencies have same (crate-name, disambiguator) but different SVH // E0526, // shuffle indices are not constant // E0540, // multiple rustc_deprecated attributes |