diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-06-06 22:00:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 22:00:21 +0200 |
| commit | 53881f91b0036e65090bc874bf69b7ad6ab3ecde (patch) | |
| tree | 2ee725ca1d07db188ff37926503d8b9d6ecdd6c0 | |
| parent | fd6efcf9602d6a82068b6eb1600971795a0f3f93 (diff) | |
| parent | 0e01088f077c572bbca791fbed54c1bbe80afdb0 (diff) | |
| download | rust-53881f91b0036e65090bc874bf69b7ad6ab3ecde.tar.gz rust-53881f91b0036e65090bc874bf69b7ad6ab3ecde.zip | |
Rollup merge of #112356 - Nilstrieb:get-region-var-origins, r=compiler-errors
Fix comment for `get_region_var_origins` #109753 changed the logic but not the comment. r? `@compiler-errors`
| -rw-r--r-- | compiler/rustc_infer/src/infer/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_infer/src/infer/mod.rs b/compiler/rustc_infer/src/infer/mod.rs index 447d4c9f84b..f36102fe2ea 100644 --- a/compiler/rustc_infer/src/infer/mod.rs +++ b/compiler/rustc_infer/src/infer/mod.rs @@ -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) |
