Skip to content

Commit 8b09ba6

Browse files
committedNov 9, 2021
Auto merge of #90734 - matthiaskrgr:rollup-e1euotp, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #89561 (Type inference for inline consts) - #90035 (implement rfc-2528 type_changing-struct-update) - #90613 (Allow to run a specific rustdoc-js* test) - #90683 (Make `compiler-docs` only control the default instead of being a hard off-switch) - #90685 (x.py: remove fixme by deleting code) - #90701 (Record more artifact sizes during self-profiling.) - #90723 (Better document `Box` and `alloc::alloc::box_free` connection) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.90.01.58.0
2 parents d608229 + 9c1aa12 commit 8b09ba6

File tree

69 files changed

+1130
-235
lines changed

Some content is hidden

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

69 files changed

+1130
-235
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
408408
let param = generics.type_param(&param_ty, tcx);
409409
if let Some(generics) = tcx
410410
.hir()
411-
.get_generics(tcx.closure_base_def_id(self.mir_def_id().to_def_id()))
411+
.get_generics(tcx.typeck_root_def_id(self.mir_def_id().to_def_id()))
412412
{
413413
suggest_constraining_type_param(
414414
tcx,

‎compiler/rustc_borrowck/src/nll.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ pub(super) fn dump_annotation<'a, 'tcx>(
376376
errors_buffer: &mut Vec<Diagnostic>,
377377
) {
378378
let tcx = infcx.tcx;
379-
let base_def_id = tcx.closure_base_def_id(body.source.def_id());
379+
let base_def_id = tcx.typeck_root_def_id(body.source.def_id());
380380
if !tcx.has_attr(base_def_id, sym::rustc_regions) {
381381
return;
382382
}

0 commit comments

Comments
 (0)
Please sign in to comment.