@@ -557,7 +557,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
557557 path,
558558 kind,
559559 parent_scope,
560- true ,
561560 force,
562561 deleg_impl,
563562 invoc_in_mod_inert_attr. map ( |def_id| ( def_id, node_id) ) ,
@@ -710,7 +709,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
710709 path,
711710 MacroKind :: Derive ,
712711 parent_scope,
713- true ,
714712 force,
715713 None ,
716714 None ,
@@ -724,7 +722,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
724722 ast_path : & ast:: Path ,
725723 kind : MacroKind ,
726724 parent_scope : & ParentScope < ' ra > ,
727- trace : bool ,
728725 force : bool ,
729726 deleg_impl : Option < LocalDefId > ,
730727 invoc_in_mod_inert_attr : Option < ( LocalDefId , NodeId ) > ,
@@ -763,16 +760,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
763760 PathResult :: Module ( ..) => unreachable ! ( ) ,
764761 } ;
765762
766- if trace {
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- ) ) ;
775- }
763+ self . multi_segment_macro_resolutions . borrow_mut ( & self ) . push ( (
764+ path,
765+ path_span,
766+ kind,
767+ * parent_scope,
768+ res. ok ( ) ,
769+ ns,
770+ ) ) ;
776771
777772 self . prohibit_imported_non_macro_attrs ( None , res. ok ( ) , path_span) ;
778773 res
@@ -790,15 +785,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
790785 return Err ( Determinacy :: Undetermined ) ;
791786 }
792787
793- if trace {
794- self . single_segment_macro_resolutions . borrow_mut ( & self ) . push ( (
795- path[ 0 ] . ident ,
796- kind,
797- * parent_scope,
798- binding. ok ( ) ,
799- suggestion_span,
800- ) ) ;
801- }
788+ self . single_segment_macro_resolutions . borrow_mut ( & self ) . push ( (
789+ path[ 0 ] . ident ,
790+ kind,
791+ * parent_scope,
792+ binding. ok ( ) ,
793+ suggestion_span,
794+ ) ) ;
802795
803796 let res = binding. map ( |binding| binding. res ( ) ) ;
804797 self . prohibit_imported_non_macro_attrs ( binding. ok ( ) , res. ok ( ) , path_span) ;
0 commit comments