diff options
| author | bors <bors@rust-lang.org> | 2023-10-27 10:19:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-27 10:19:35 +0000 |
| commit | 95f6a01e8f8fb121ded7d0eaa86906437cb08652 (patch) | |
| tree | c98758855add922259cd3f000fa82f5747fac7dc /compiler/rustc_errors/src | |
| parent | 54e57e66ffb8ef4f97916d46f40ddcb464fc8be3 (diff) | |
| parent | 2fdac630b4b38c8b2669d5b6071f9b822a2d3729 (diff) | |
| download | rust-95f6a01e8f8fb121ded7d0eaa86906437cb08652.tar.gz rust-95f6a01e8f8fb121ded7d0eaa86906437cb08652.zip | |
Auto merge of #117272 - matthiaskrgr:rollup-upg122z, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #114998 (feat(docs): add cargo-pgo to PGO documentation 📝) - #116868 (Tweak suggestion span for outer attr and point at item following invalid inner attr) - #117240 (Fix documentation typo in std::iter::Iterator::collect_into) - #117241 (Stash and cancel cycle errors for auto trait leakage in opaques) - #117262 (Create a new ConstantKind variant (ZeroSized) for StableMIR) - #117266 (replace transmute by raw pointer cast) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index da74ee6391a..5e3fdf170bc 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -508,6 +508,8 @@ pub enum StashKey { TraitMissingMethod, OpaqueHiddenTypeMismatch, MaybeForgetReturn, + /// Query cycle detected, stashing in favor of a better error. + Cycle, } fn default_track_diagnostic(d: &mut Diagnostic, f: &mut dyn FnMut(&mut Diagnostic)) { |