bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Address review comments

Browse source
This commit is contained in:
xFrednet 2022-02-18 12:00:16 +01:00
parent 4887eb7b2d
commit defc056ccc
No known key found for this signature in database
GPG key ID: FCDCBF29AF64D601
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_errors/src/lib.rs
View file

@ -947,8 +947,8 @@ impl Handler {
.get_expectation_id()
.expect("all diagnostics inside `unstable_expect_diagnostics` must have a `LintExpectationId`");
// The unstable to stable map only maps the unstable it to a stable id
// the lint index is manually transferred here.
// The unstable to stable map only maps the unstable `AttrId` to a stable `HirId` with an attribute index.
// The lint index inside the attribute is manually transferred here.
let lint_index = unstable_id.get_lint_index();
unstable_id.set_lint_index(None);
let mut stable_id = *unstable_to_stable
@ -966,6 +966,10 @@ impl Handler {
/// This methods steals all [`LintExpectationId`]s that are stored inside
/// [`HandlerInner`] and indicate that the linked expectation has been fulfilled.
pub fn steal_fulfilled_expectation_ids(&self) -> FxHashSet<LintExpectationId> {
assert!(
self.inner.borrow().unstable_expect_diagnostics.is_empty(),
"`HandlerInner::unstable_expect_diagnostics` should be empty at this point",
);
std::mem::take(&mut self.inner.borrow_mut().fulfilled_expectations)
}
}