Skip to content

Commit 8ece939

Browse files
committed
Remove trace argument from resolve_macro_or_delegation_path.
It's `true` at all call sites.
1 parent 258a446 commit 8ece939

File tree

1 file changed

+15
-22
lines changed

1 file changed

+15
-22
lines changed

compiler/rustc_resolve/src/macros.rs

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
561561
path,
562562
kind,
563563
parent_scope,
564-
true,
565564
force,
566565
deleg_impl,
567566
invoc_in_mod_inert_attr.map(|def_id| (def_id, node_id)),
@@ -714,7 +713,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
714713
path,
715714
MacroKind::Derive,
716715
parent_scope,
717-
true,
718716
force,
719717
None,
720718
None,
@@ -728,7 +726,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
728726
ast_path: &ast::Path,
729727
kind: MacroKind,
730728
parent_scope: &ParentScope<'ra>,
731-
trace: bool,
732729
force: bool,
733730
deleg_impl: Option<LocalDefId>,
734731
invoc_in_mod_inert_attr: Option<(LocalDefId, NodeId)>,
@@ -767,16 +764,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
767764
PathResult::Module(..) => unreachable!(),
768765
};
769766

770-
if trace {
771-
self.multi_segment_macro_resolutions.borrow_mut(&self).push((
772-
path,
773-
path_span,
774-
kind,
775-
*parent_scope,
776-
res.ok(),
777-
ns,
778-
));
779-
}
767+
self.multi_segment_macro_resolutions.borrow_mut(&self).push((
768+
path,
769+
path_span,
770+
kind,
771+
*parent_scope,
772+
res.ok(),
773+
ns,
774+
));
780775

781776
self.prohibit_imported_non_macro_attrs(None, res.ok(), path_span);
782777
res
@@ -794,15 +789,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
794789
return Err(Determinacy::Undetermined);
795790
}
796791

797-
if trace {
798-
self.single_segment_macro_resolutions.borrow_mut(&self).push((
799-
path[0].ident,
800-
kind,
801-
*parent_scope,
802-
binding.ok(),
803-
suggestion_span,
804-
));
805-
}
792+
self.single_segment_macro_resolutions.borrow_mut(&self).push((
793+
path[0].ident,
794+
kind,
795+
*parent_scope,
796+
binding.ok(),
797+
suggestion_span,
798+
));
806799

807800
let res = binding.map(|binding| binding.res());
808801
self.prohibit_imported_non_macro_attrs(binding.ok(), res.ok(), path_span);

0 commit comments

Comments
 (0)