diff options
| author | bors <bors@rust-lang.org> | 2023-05-23 12:47:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-23 12:47:51 +0000 |
| commit | b08148f6a76010ea3d4e91d61245aa7aac59e4b4 (patch) | |
| tree | bb3f063f430b4843502fa17bd691aff6f4cbc056 /compiler/rustc_errors/src | |
| parent | f3d597b31c0f101a02c230798afa31a36bdacbc6 (diff) | |
| parent | c4f2a62182da7d2fce3a961fe12ffb7d72097ca2 (diff) | |
| download | rust-b08148f6a76010ea3d4e91d61245aa7aac59e4b4.tar.gz rust-b08148f6a76010ea3d4e91d61245aa7aac59e4b4.zip | |
Auto merge of #111869 - Dylan-DPC:rollup-9pydw08, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #111461 (Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic) - #111579 (Also assume wrap-around discriminants in `as` MIR building) - #111704 (Remove return type sized check hack from hir typeck) - #111853 (Check opaques for mismatch during writeback) - #111854 (rustdoc: clean up `settings.css`) - #111860 (Don't ICE if method receiver fails to unify with `arbitrary_self_types`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 5a80024f19b..074fbb1322c 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -478,6 +478,7 @@ pub enum StashKey { MaybeFruTypo, CallAssocMethod, TraitMissingMethod, + OpaqueHiddenTypeMismatch, } fn default_track_diagnostic(d: &mut Diagnostic, f: &mut dyn FnMut(&mut Diagnostic)) { |