Skip to content

Commit

Permalink
Rollup merge of #112356 - Nilstrieb:get-region-var-origins, r=compile…
Browse files Browse the repository at this point in the history
…r-errors

Fix comment for `get_region_var_origins`

#109753 changed the logic but not the comment.

r? `@compiler-errors`
  • Loading branch information
matthiaskrgr authored Jun 6, 2023
2 parents fd6efcf + 0e01088 commit 53881f9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions compiler/rustc_infer/src/infer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1195,15 +1195,15 @@ impl<'tcx> InferCtxt<'tcx> {
.var_origin(vid)
}

/// Takes ownership of the list of variable regions. This implies
/// that all the region constraints have already been taken, and
/// hence that `resolve_regions_and_report_errors` can never be
/// called. This is used only during NLL processing to "hand off" ownership
/// of the set of region variables into the NLL region context.
/// Clone the list of variable regions. This is used only during NLL processing
/// to put the set of region variables into the NLL region context.
pub fn get_region_var_origins(&self) -> VarInfos {
let mut inner = self.inner.borrow_mut();
let (var_infos, data) = inner
.region_constraint_storage
// We clone instead of taking because borrowck still wants to use
// the inference context after calling this for diagnostics
// and the new trait solver.
.clone()
.expect("regions already resolved")
.with_log(&mut inner.undo_log)
Expand Down

0 comments on commit 53881f9

Please sign in to comment.