Skip to content

Commit deba5dd

Browse files
committedJan 10, 2023
Auto merge of #106656 - JohnTitor:rollup-rk2qltg, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #105034 (Add example for iterator_flatten) - #105708 (Enable atomic cas for bpf targets) - #106175 (Fix bad import suggestion with nested `use` tree) - #106204 (No need to take opaques in `check_type_bounds`) - #106387 (Revert "bootstrap: Get rid of `tail_args` in `stream_cargo`") - #106636 (Accept old spelling of Fuchsia target triples) - #106639 (update Miri) - #106640 (update test for inductive canonical cycles) - #106647 (rustdoc: merge common CSS for `a`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents d53924d + ed840a6 commit deba5dd

File tree

48 files changed

+553
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+553
-177
lines changed
 

‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
318318

319319
// This is still required for many(half of the tests in ui/type-alias-impl-trait)
320320
// tests to pass
321-
let _ = infcx.inner.borrow_mut().opaque_type_storage.take_opaque_types();
321+
let _ = infcx.take_opaque_types();
322322

323323
if errors.is_empty() {
324324
definition_ty

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub(crate) fn type_check<'mir, 'tcx>(
209209
);
210210

211211
translate_outlives_facts(&mut checker);
212-
let opaque_type_values = infcx.inner.borrow_mut().opaque_type_storage.take_opaque_types();
212+
let opaque_type_values = infcx.take_opaque_types();
213213

214214
let opaque_type_values = opaque_type_values
215215
.into_iter()

0 commit comments

Comments
 (0)