Skip to content

Commit 2ac60bc

Browse files
oli-obkZoxc
authored andcommitted
We always use the current item as parent, so no need to pass it
1 parent a932eb3 commit 2ac60bc

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
492492
let mut generic_args = ThinVec::new();
493493
for (idx, arg) in args.iter().cloned().enumerate() {
494494
if legacy_args_idx.contains(&idx) {
495-
let parent_def_id = self.current_hir_id_owner.def_id;
496495
let node_id = self.next_node_id();
497-
self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, f.span);
496+
self.create_def(node_id, None, DefKind::AnonConst, f.span);
498497
let mut visitor = WillCreateDefIdsVisitor {};
499498
let const_value = if let ControlFlow::Break(span) = visitor.visit_expr(&arg) {
500499
AstP(Expr {

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,12 +494,12 @@ enum GenericArgsMode {
494494
impl<'a, 'hir> LoweringContext<'a, 'hir> {
495495
fn create_def(
496496
&mut self,
497-
parent: LocalDefId,
498497
node_id: ast::NodeId,
499498
name: Option<Symbol>,
500499
def_kind: DefKind,
501500
span: Span,
502501
) -> LocalDefId {
502+
let parent = self.current_hir_id_owner.def_id;
503503
debug_assert_ne!(node_id, ast::DUMMY_NODE_ID);
504504
assert!(
505505
self.opt_local_def_id(node_id).is_none(),
@@ -781,7 +781,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
781781
LifetimeRes::Fresh { param, kind, .. } => {
782782
// Late resolution delegates to us the creation of the `LocalDefId`.
783783
let _def_id = self.create_def(
784-
self.current_hir_id_owner.def_id,
785784
param,
786785
Some(kw::UnderscoreLifetime),
787786
DefKind::LifetimeParam,
@@ -2107,16 +2106,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
21072106
hir::ConstArgKind::Path(qpath)
21082107
} else {
21092108
// Construct an AnonConst where the expr is the "ty"'s path.
2110-
2111-
let parent_def_id = self.current_hir_id_owner.def_id;
21122109
let node_id = self.next_node_id();
21132110
let span = self.lower_span(span);
21142111

21152112
// Add a definition for the in-band const def.
21162113
// We're lowering a const argument that was originally thought to be a type argument,
21172114
// so the def collector didn't create the def ahead of time. That's why we have to do
21182115
// it here.
2119-
let def_id = self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, span);
2116+
let def_id = self.create_def(node_id, None, DefKind::AnonConst, span);
21202117
let hir_id = self.lower_node_id(node_id);
21212118

21222119
let path_expr = Expr {

compiler/rustc_ast_lowering/src/pat.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,14 +517,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
517517
span: Span,
518518
base_type: Span,
519519
) -> &'hir hir::ConstArg<'hir> {
520-
let parent_def_id = self.current_hir_id_owner.def_id;
521520
let node_id = self.next_node_id();
522521

523522
// Add a definition for the in-band const def.
524523
// We're generating a range end that didn't exist in the AST,
525524
// so the def collector didn't create the def ahead of time. That's why we have to do
526525
// it here.
527-
let def_id = self.create_def(parent_def_id, node_id, None, DefKind::AnonConst, span);
526+
let def_id = self.create_def(node_id, None, DefKind::AnonConst, span);
528527
let hir_id = self.lower_node_id(node_id);
529528

530529
let unstable_span = self.mark_span_with_reason(

0 commit comments

Comments
 (0)