Skip to content

Rollup of 10 pull requests #104542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
72fbb54
Don't remap early-bound RPITIT regions that originate from impl
compiler-errors Nov 1, 2022
b4580d5
Simplify settings UI by merging system theme with the theme choices
GuillaumeGomez Nov 13, 2022
4074aae
Update GUI test
GuillaumeGomez Nov 13, 2022
dacf9b8
Extend GUI test for theme settings
GuillaumeGomez Nov 13, 2022
634df06
Generalize the `ToPredicate` trait
oli-obk Jul 20, 2022
4f11f3b
Convert predicates into Predicate in the Obligation constructor
oli-obk Nov 9, 2022
20ea083
fix #104390, fix ICE in in_operand for ty error
chenyukang Nov 15, 2022
9c2d4dd
fix #104510, Remove is_tainted_by_errors since we have ty_error for d…
chenyukang Nov 16, 2022
b44d808
Don't attempt to normalize compiler backtraces
djkoloski Nov 16, 2022
4edbaef
Edit docs for `rustc_errors::Handler::stash_diagnostic`
pierwill Nov 16, 2022
893bd78
rustdoc: remove redundant font-color CSS on `.where`
notriddle Nov 16, 2022
75afb22
Check `dyn*` return type correctly
compiler-errors Nov 16, 2022
ebee589
rustdoc: clean up sidebar width CSS
notriddle Nov 17, 2022
65bd668
Rollup merge of #103852 - compiler-errors:rpitit-early-from-impl, r=lcnr
matthiaskrgr Nov 17, 2022
3c4be61
Rollup merge of #104366 - GuillaumeGomez:simplify-settings-theme-choi…
matthiaskrgr Nov 17, 2022
d476d21
Rollup merge of #104444 - chenyukang:yukang/fix-104390, r=compiler-er…
matthiaskrgr Nov 17, 2022
8c3bad2
Rollup merge of #104483 - oli-obk:santa-clauses-make-goals, r=compile…
matthiaskrgr Nov 17, 2022
940a441
Rollup merge of #104496 - djkoloski:dont_normalize_compiler_backtrace…
matthiaskrgr Nov 17, 2022
2440c02
Rollup merge of #104498 - pierwill:stash-diag-docs, r=compiler-errors
matthiaskrgr Nov 17, 2022
0a06bcf
Rollup merge of #104503 - notriddle:notriddle/where, r=GuillaumeGomez
matthiaskrgr Nov 17, 2022
6e033cc
Rollup merge of #104508 - compiler-errors:dyn-return, r=oli-obk
matthiaskrgr Nov 17, 2022
f50bdc9
Rollup merge of #104515 - chenyukang:yukang/fix-104510-ice, r=compile…
matthiaskrgr Nov 17, 2022
dc1c27a
Rollup merge of #104516 - notriddle:notriddle/flex-basis-sidebar-widt…
matthiaskrgr Nov 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Edit docs for rustc_errors::Handler::stash_diagnostic
Clarify that the diagnostic can be retrieved with `steal_diagnostic`.
  • Loading branch information
pierwill committed Nov 16, 2022
commit 4edbaefceb5159252db5906c3ee9a3a49321e2b3
5 changes: 3 additions & 2 deletions compiler/rustc_errors/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,14 @@ impl Handler {
inner.stashed_diagnostics = Default::default();
}

/// Stash a given diagnostic with the given `Span` and `StashKey` as the key for later stealing.
/// Stash a given diagnostic with the given `Span` and [`StashKey`] as the key.
/// Retrieve a stashed diagnostic with [`steal_diagnostic`].
pub fn stash_diagnostic(&self, span: Span, key: StashKey, diag: Diagnostic) {
let mut inner = self.inner.borrow_mut();
inner.stash((span, key), diag);
}

/// Steal a previously stashed diagnostic with the given `Span` and `StashKey` as the key.
/// Steal a previously stashed diagnostic with the given `Span` and [`StashKey`] as the key.
pub fn steal_diagnostic(&self, span: Span, key: StashKey) -> Option<DiagnosticBuilder<'_, ()>> {
let mut inner = self.inner.borrow_mut();
inner.steal((span, key)).map(|diag| DiagnosticBuilder::new_diagnostic(self, diag))
Expand Down