Skip to content

Commit b794f8f

Browse files
borsbors
committed
Auto merge of rust-lang#120714 - matthiaskrgr:rollup-e7x55g1, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#119939 (Improve 'generic param from outer item' error for `Self` and inside `static`/`const` items) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120331 (pattern_analysis: use a plain `Vec` in `DeconstructedPat`) - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120502 (Remove `ffi_returns_twice` feature) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120513 (Normalize type outlives obligations in NLL for new solver) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4a2fe44 + 3ba5334 commit b794f8f

File tree

153 files changed

+1690
-1111
lines changed

Some content is hidden

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

153 files changed

+1690
-1111
lines changed

Diff for: ‎compiler/rustc_ast_lowering/src/index.rs

+36-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct NodeCollector<'a, 'hir> {
1515
bodies: &'a SortedMap<ItemLocalId, &'hir Body<'hir>>,
1616

1717
/// Outputs
18-
nodes: IndexVec<ItemLocalId, Option<ParentedNode<'hir>>>,
18+
nodes: IndexVec<ItemLocalId, ParentedNode<'hir>>,
1919
parenting: LocalDefIdMap<ItemLocalId>,
2020

2121
/// The parent of this node
@@ -29,16 +29,19 @@ pub(super) fn index_hir<'hir>(
2929
tcx: TyCtxt<'hir>,
3030
item: hir::OwnerNode<'hir>,
3131
bodies: &SortedMap<ItemLocalId, &'hir Body<'hir>>,
32-
) -> (IndexVec<ItemLocalId, Option<ParentedNode<'hir>>>, LocalDefIdMap<ItemLocalId>) {
33-
let mut nodes = IndexVec::new();
32+
num_nodes: usize,
33+
) -> (IndexVec<ItemLocalId, ParentedNode<'hir>>, LocalDefIdMap<ItemLocalId>) {
34+
let zero_id = ItemLocalId::new(0);
35+
let err_node = ParentedNode { parent: zero_id, node: Node::Err(item.span()) };
36+
let mut nodes = IndexVec::from_elem_n(err_node, num_nodes);
3437
// This node's parent should never be accessed: the owner's parent is computed by the
3538
// hir_owner_parent query. Make it invalid (= ItemLocalId::MAX) to force an ICE whenever it is
3639
// used.
37-
nodes.push(Some(ParentedNode { parent: ItemLocalId::INVALID, node: item.into() }));
40+
nodes[zero_id] = ParentedNode { parent: ItemLocalId::INVALID, node: item.into() };
3841
let mut collector = NodeCollector {
3942
tcx,
4043
owner: item.def_id(),
41-
parent_node: ItemLocalId::new(0),
44+
parent_node: zero_id,
4245
nodes,
4346
bodies,
4447
parenting: Default::default(),
@@ -54,6 +57,14 @@ pub(super) fn index_hir<'hir>(
5457
OwnerNode::ForeignItem(item) => collector.visit_foreign_item(item),
5558
};
5659

60+
for (local_id, node) in collector.nodes.iter_enumerated() {
61+
if let Node::Err(span) = node.node {
62+
let hir_id = HirId { owner: item.def_id(), local_id };
63+
let msg = format!("ID {hir_id} not encountered when visiting item HIR");
64+
tcx.dcx().span_delayed_bug(*span, msg);
65+
}
66+
}
67+
5768
(collector.nodes, collector.parenting)
5869
}
5970

@@ -88,7 +99,7 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
8899
}
89100
}
90101

91-
self.nodes.insert(hir_id.local_id, ParentedNode { parent: self.parent_node, node });
102+
self.nodes[hir_id.local_id] = ParentedNode { parent: self.parent_node, node };
92103
}
93104

94105
fn with_parent<F: FnOnce(&mut Self)>(&mut self, parent_node_id: HirId, f: F) {
@@ -348,4 +359,23 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
348359

349360
self.visit_nested_foreign_item(id);
350361
}
362+
363+
fn visit_where_predicate(&mut self, predicate: &'hir WherePredicate<'hir>) {
364+
match predicate {
365+
WherePredicate::BoundPredicate(pred) => {
366+
self.insert(pred.span, pred.hir_id, Node::WhereBoundPredicate(pred));
367+
self.with_parent(pred.hir_id, |this| {
368+
intravisit::walk_where_predicate(this, predicate)
369+
})
370+
}
371+
_ => intravisit::walk_where_predicate(self, predicate),
372+
}
373+
}
374+
375+
fn visit_array_length(&mut self, len: &'hir ArrayLen) {
376+
match len {
377+
ArrayLen::Infer(inf) => self.insert(inf.span, inf.hir_id, Node::ArrayLenInfer(inf)),
378+
ArrayLen::Body(..) => intravisit::walk_array_len(self, len),
379+
}
380+
}
351381
}

Diff for: ‎compiler/rustc_ast_lowering/src/item.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
498498
}
499499
}
500500

501-
let res =
502-
self.expect_full_res_from_use(id).map(|res| self.lower_res(res)).collect();
501+
let res = self.lower_import_res(id);
503502
let path = self.lower_use_path(res, &path, ParamMode::Explicit);
504503
hir::ItemKind::Use(path, hir::UseKind::Single)
505504
}
@@ -569,8 +568,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
569568
});
570569
}
571570

572-
let res =
573-
self.expect_full_res_from_use(id).map(|res| self.lower_res(res)).collect();
571+
let res = self.lower_import_res(id);
574572
let path = self.lower_use_path(res, &prefix, ParamMode::Explicit);
575573
hir::ItemKind::Use(path, hir::UseKind::ListStem)
576574
}

Diff for: ‎compiler/rustc_ast_lowering/src/lib.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
6464
use rustc_session::parse::{add_feature_diagnostics, feature_err};
6565
use rustc_span::symbol::{kw, sym, Ident, Symbol};
6666
use rustc_span::{DesugaringKind, Span, DUMMY_SP};
67-
use smallvec::SmallVec;
67+
use smallvec::{smallvec, SmallVec};
6868
use std::collections::hash_map::Entry;
6969
use thin_vec::ThinVec;
7070

@@ -675,7 +675,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
675675
} else {
676676
(None, None)
677677
};
678-
let (nodes, parenting) = index::index_hir(self.tcx, node, &bodies);
678+
let num_nodes = self.item_local_id_counter.as_usize();
679+
let (nodes, parenting) = index::index_hir(self.tcx, node, &bodies, num_nodes);
679680
let nodes = hir::OwnerNodes { opt_hash_including_bodies, nodes, bodies };
680681
let attrs = hir::AttributeMap { map: attrs, opt_hash: attrs_hash };
681682

@@ -750,8 +751,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
750751
self.resolver.get_partial_res(id).map_or(Res::Err, |pr| pr.expect_full_res())
751752
}
752753

753-
fn expect_full_res_from_use(&mut self, id: NodeId) -> impl Iterator<Item = Res<NodeId>> {
754-
self.resolver.get_import_res(id).present_items()
754+
fn lower_import_res(&mut self, id: NodeId) -> SmallVec<[Res; 3]> {
755+
let res = self.resolver.get_import_res(id).present_items();
756+
let res: SmallVec<_> = res.map(|res| self.lower_res(res)).collect();
757+
// FIXME: The `Res::Err` doesn't necessarily mean an error was reported, it also happens
758+
// for import list stem items with non-empty list. Instead, consider not emitting such
759+
// items into HIR at all, or fill the `import_res_map` tables for them in resolve if that
760+
// is not possible. Then add `span_delayed_bug` here.
761+
if !res.is_empty() { res } else { smallvec![Res::Err] }
755762
}
756763

757764
fn make_lang_item_qpath(&mut self, lang_item: hir::LangItem, span: Span) -> hir::QPath<'hir> {

Diff for: ‎compiler/rustc_ast_lowering/src/path.rs

+1
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
196196
p: &Path,
197197
param_mode: ParamMode,
198198
) -> &'hir hir::UsePath<'hir> {
199+
assert!((1..=3).contains(&res.len()));
199200
self.arena.alloc(hir::UsePath {
200201
res,
201202
segments: self.arena.alloc_from_iter(p.segments.iter().map(|segment| {

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+57-64
Original file line numberDiff line numberDiff line change
@@ -401,66 +401,60 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
401401
}
402402
let typeck = self.infcx.tcx.typeck(self.mir_def_id());
403403
let hir_id = hir.parent_id(expr.hir_id);
404-
if let Some(parent) = self.infcx.tcx.opt_hir_node(hir_id) {
405-
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
406-
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
407-
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
408-
{
409-
(def_id.as_local(), args, 1)
410-
} else if let hir::Node::Expr(parent_expr) = parent
411-
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
412-
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
413-
{
414-
(def_id.as_local(), args, 0)
415-
} else {
416-
(None, &[][..], 0)
404+
let parent = self.infcx.tcx.hir_node(hir_id);
405+
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
406+
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
407+
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
408+
{
409+
(def_id.as_local(), args, 1)
410+
} else if let hir::Node::Expr(parent_expr) = parent
411+
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
412+
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
413+
{
414+
(def_id.as_local(), args, 0)
415+
} else {
416+
(None, &[][..], 0)
417+
};
418+
if let Some(def_id) = def_id
419+
&& let node =
420+
self.infcx.tcx.hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
421+
&& let Some(fn_sig) = node.fn_sig()
422+
&& let Some(ident) = node.ident()
423+
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
424+
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
425+
{
426+
let mut span: MultiSpan = arg.span.into();
427+
span.push_span_label(
428+
arg.span,
429+
"this parameter takes ownership of the value".to_string(),
430+
);
431+
let descr = match node.fn_kind() {
432+
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
433+
Some(hir::intravisit::FnKind::Method(..)) => "method",
434+
Some(hir::intravisit::FnKind::Closure) => "closure",
417435
};
418-
if let Some(def_id) = def_id
419-
&& let Some(node) = self
420-
.infcx
421-
.tcx
422-
.opt_hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
423-
&& let Some(fn_sig) = node.fn_sig()
424-
&& let Some(ident) = node.ident()
425-
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
426-
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
427-
{
428-
let mut span: MultiSpan = arg.span.into();
429-
span.push_span_label(
430-
arg.span,
431-
"this parameter takes ownership of the value".to_string(),
432-
);
433-
let descr = match node.fn_kind() {
434-
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
435-
Some(hir::intravisit::FnKind::Method(..)) => "method",
436-
Some(hir::intravisit::FnKind::Closure) => "closure",
437-
};
438-
span.push_span_label(ident.span, format!("in this {descr}"));
439-
err.span_note(
440-
span,
441-
format!(
442-
"consider changing this parameter type in {descr} `{ident}` to \
436+
span.push_span_label(ident.span, format!("in this {descr}"));
437+
err.span_note(
438+
span,
439+
format!(
440+
"consider changing this parameter type in {descr} `{ident}` to \
443441
borrow instead if owning the value isn't necessary",
444-
),
445-
);
446-
}
447-
let place = &self.move_data.move_paths[mpi].place;
448-
let ty = place.ty(self.body, self.infcx.tcx).ty;
449-
if let hir::Node::Expr(parent_expr) = parent
450-
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
451-
&& let hir::ExprKind::Path(hir::QPath::LangItem(
452-
LangItem::IntoIterIntoIter,
453-
_,
454-
)) = call_expr.kind
455-
{
456-
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
457-
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } =
458-
move_spans
459-
{
460-
// We already suggest cloning for these cases in `explain_captures`.
461-
} else {
462-
self.suggest_cloning(err, ty, expr, move_span);
463-
}
442+
),
443+
);
444+
}
445+
let place = &self.move_data.move_paths[mpi].place;
446+
let ty = place.ty(self.body, self.infcx.tcx).ty;
447+
if let hir::Node::Expr(parent_expr) = parent
448+
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
449+
&& let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IntoIterIntoIter, _)) =
450+
call_expr.kind
451+
{
452+
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
453+
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans
454+
{
455+
// We already suggest cloning for these cases in `explain_captures`.
456+
} else {
457+
self.suggest_cloning(err, ty, expr, move_span);
464458
}
465459
}
466460
if let Some(pat) = finder.pat {
@@ -1762,7 +1756,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17621756
fn_decl: hir::FnDecl { inputs, .. },
17631757
..
17641758
}) = e.kind
1765-
&& let Some(hir::Node::Expr(body)) = self.tcx.opt_hir_node(body.hir_id)
1759+
&& let hir::Node::Expr(body) = self.tcx.hir_node(body.hir_id)
17661760
{
17671761
self.suggest_arg = "this: &Self".to_string();
17681762
if inputs.len() > 0 {
@@ -1828,11 +1822,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
18281822
}
18291823
}
18301824

1831-
if let Some(hir::Node::ImplItem(hir::ImplItem {
1825+
if let hir::Node::ImplItem(hir::ImplItem {
18321826
kind: hir::ImplItemKind::Fn(_fn_sig, body_id),
18331827
..
1834-
})) = self.infcx.tcx.opt_hir_node(self.mir_hir_id())
1835-
&& let Some(hir::Node::Expr(expr)) = self.infcx.tcx.opt_hir_node(body_id.hir_id)
1828+
}) = self.infcx.tcx.hir_node(self.mir_hir_id())
1829+
&& let hir::Node::Expr(expr) = self.infcx.tcx.hir_node(body_id.hir_id)
18361830
{
18371831
let mut finder = ExpressionFinder {
18381832
capture_span: *capture_kind_span,
@@ -2400,8 +2394,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
24002394
let proper_span = proper_span.source_callsite();
24012395
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
24022396
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
2403-
&& let Some(node) = self.infcx.tcx.opt_hir_node(scope_data.lint_root)
2404-
&& let Some(id) = node.body_id()
2397+
&& let Some(id) = self.infcx.tcx.hir_node(scope_data.lint_root).body_id()
24052398
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir().body(id).value.kind
24062399
{
24072400
for stmt in block.stmts {

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
8787
if let hir::ExprKind::Path(hir::QPath::Resolved(None, p)) = expr.kind
8888
&& let [hir::PathSegment { ident, args: None, .. }] = p.segments
8989
&& let hir::def::Res::Local(hir_id) = p.res
90-
&& let Some(hir::Node::Pat(pat)) = tcx.opt_hir_node(hir_id)
90+
&& let hir::Node::Pat(pat) = tcx.hir_node(hir_id)
9191
{
9292
err.span_label(pat.span, format!("binding `{ident}` declared here"));
9393
}

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
396396

397397
let upvar_hir_id = captured_place.get_root_variable();
398398

399-
if let Some(Node::Pat(pat)) = self.infcx.tcx.opt_hir_node(upvar_hir_id)
399+
if let Node::Pat(pat) = self.infcx.tcx.hir_node(upvar_hir_id)
400400
&& let hir::PatKind::Binding(hir::BindingAnnotation::NONE, _, upvar_ident, _) =
401401
pat.kind
402402
{
@@ -688,15 +688,15 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
688688
break;
689689
}
690690
f_in_trait_opt.and_then(|f_in_trait| {
691-
match self.infcx.tcx.opt_hir_node(f_in_trait) {
692-
Some(Node::TraitItem(hir::TraitItem {
691+
match self.infcx.tcx.hir_node(f_in_trait) {
692+
Node::TraitItem(hir::TraitItem {
693693
kind:
694694
hir::TraitItemKind::Fn(
695695
hir::FnSig { decl: hir::FnDecl { inputs, .. }, .. },
696696
_,
697697
),
698698
..
699-
})) => {
699+
}) => {
700700
let hir::Ty { span, .. } = inputs[local.index() - 1];
701701
Some(span)
702702
}
@@ -759,10 +759,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
759759
//
760760
// `let &b = a;` -> `let &(mut b) = a;`
761761
if let Some(hir_id) = hir_id
762-
&& let Some(hir::Node::Local(hir::Local {
762+
&& let hir::Node::Local(hir::Local {
763763
pat: hir::Pat { kind: hir::PatKind::Ref(_, _), .. },
764764
..
765-
})) = self.infcx.tcx.opt_hir_node(hir_id)
765+
}) = self.infcx.tcx.hir_node(hir_id)
766766
&& let Ok(name) =
767767
self.infcx.tcx.sess.source_map().span_to_snippet(local_decl.source_info.span)
768768
{
@@ -1206,7 +1206,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
12061206
};
12071207

12081208
if let Some(hir_id) = hir_id
1209-
&& let Some(hir::Node::Local(local)) = self.infcx.tcx.opt_hir_node(hir_id)
1209+
&& let hir::Node::Local(local) = self.infcx.tcx.hir_node(hir_id)
12101210
{
12111211
let tables = self.infcx.tcx.typeck(def_id.as_local().unwrap());
12121212
if let Some(clone_trait) = self.infcx.tcx.lang_items().clone_trait()

Diff for: ‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
216216
if let Some(id) = placeholder.bound.kind.get_id()
217217
&& let Some(placeholder_id) = id.as_local()
218218
&& let gat_hir_id = self.infcx.tcx.local_def_id_to_hir_id(placeholder_id)
219-
&& let Some(generics_impl) = hir.get_parent(gat_hir_id).generics()
219+
&& let Some(generics_impl) =
220+
hir.get_parent(hir.parent_id(gat_hir_id)).generics()
220221
{
221222
Some((gat_hir_id, generics_impl))
222223
} else {

0 commit comments

Comments
 (0)