@@ -988,35 +988,30 @@ impl Folder for Marker {
988
988
}
989
989
}
990
990
991
- // just a convenience:
992
- fn new_mark_folder ( m : Mrk ) -> Marker {
993
- Marker { mark : m}
994
- }
995
-
996
991
// apply a given mark to the given token trees. Used prior to expansion of a macro.
997
992
fn mark_tts ( tts : & [ TokenTree ] , m : Mrk ) -> Vec < TokenTree > {
998
- fold_tts ( tts, & mut new_mark_folder ( m ) )
993
+ fold_tts ( tts, & mut Marker { mark : m } )
999
994
}
1000
995
1001
996
// apply a given mark to the given expr. Used following the expansion of a macro.
1002
997
fn mark_expr ( expr : Gc < ast:: Expr > , m : Mrk ) -> Gc < ast:: Expr > {
1003
- new_mark_folder ( m ) . fold_expr ( expr)
998
+ Marker { mark : m } . fold_expr ( expr)
1004
999
}
1005
1000
1006
1001
// apply a given mark to the given pattern. Used following the expansion of a macro.
1007
1002
fn mark_pat ( pat : Gc < ast:: Pat > , m : Mrk ) -> Gc < ast:: Pat > {
1008
- new_mark_folder ( m ) . fold_pat ( pat)
1003
+ Marker { mark : m } . fold_pat ( pat)
1009
1004
}
1010
1005
1011
1006
// apply a given mark to the given stmt. Used following the expansion of a macro.
1012
1007
fn mark_stmt ( expr : & ast:: Stmt , m : Mrk ) -> Gc < ast:: Stmt > {
1013
- new_mark_folder ( m ) . fold_stmt ( expr)
1008
+ Marker { mark : m } . fold_stmt ( expr)
1014
1009
. expect_one ( "marking a stmt didn't return a stmt" )
1015
1010
}
1016
1011
1017
1012
// apply a given mark to the given item. Used following the expansion of a macro.
1018
1013
fn mark_item ( expr : Gc < ast:: Item > , m : Mrk ) -> SmallVector < Gc < ast:: Item > > {
1019
- new_mark_folder ( m ) . fold_item ( expr)
1014
+ Marker { mark : m } . fold_item ( expr)
1020
1015
}
1021
1016
1022
1017
fn original_span ( cx : & ExtCtxt ) -> Gc < codemap:: ExpnInfo > {
0 commit comments