@@ -2825,14 +2825,7 @@ impl ExprCollector<'_> {
2825
2825
let use_format_args_since_1_89_0 = fmt_args().is_some() && fmt_unsafe_arg().is_none();
2826
2826
2827
2827
let idx = if use_format_args_since_1_89_0 {
2828
- self.collect_format_args_impl(
2829
- syntax_ptr,
2830
- fmt,
2831
- hygiene,
2832
- argmap,
2833
- lit_pieces,
2834
- format_options,
2835
- )
2828
+ self.collect_format_args_impl(syntax_ptr, fmt, argmap, lit_pieces, format_options)
2836
2829
} else {
2837
2830
self.collect_format_args_before_1_89_0_impl(
2838
2831
syntax_ptr,
@@ -2962,7 +2955,6 @@ impl ExprCollector<'_> {
2962
2955
&mut self,
2963
2956
syntax_ptr: AstPtr<ast::Expr>,
2964
2957
fmt: FormatArgs,
2965
- hygiene: HygieneId,
2966
2958
argmap: FxIndexSet<(usize, ArgumentType)>,
2967
2959
lit_pieces: ExprId,
2968
2960
format_options: ExprId,
@@ -2997,8 +2989,11 @@ impl ExprCollector<'_> {
2997
2989
let args =
2998
2990
self.alloc_expr_desugared(Expr::Array(Array::ElementList { elements: args }));
2999
2991
let args_name = Name::new_symbol_root(sym::args);
3000
- let args_binding =
3001
- self.alloc_binding(args_name.clone(), BindingAnnotation::Unannotated, hygiene);
2992
+ let args_binding = self.alloc_binding(
2993
+ args_name.clone(),
2994
+ BindingAnnotation::Unannotated,
2995
+ HygieneId::ROOT,
2996
+ );
3002
2997
let args_pat = self.alloc_pat_desugared(Pat::Bind { id: args_binding, subpat: None });
3003
2998
self.add_definition_to_binding(args_binding, args_pat);
3004
2999
// TODO: We don't have `super let` yet.
@@ -3008,13 +3003,16 @@ impl ExprCollector<'_> {
3008
3003
initializer: Some(args),
3009
3004
else_branch: None,
3010
3005
};
3011
- (vec![let_stmt], self.alloc_expr_desugared(Expr::Path(Path::from( args_name))))
3006
+ (vec![let_stmt], self.alloc_expr_desugared(Expr::Path(args_name.into( ))))
3012
3007
} else {
3013
3008
// Generate:
3014
3009
// super let args = (&arg0, &arg1, &...);
3015
3010
let args_name = Name::new_symbol_root(sym::args);
3016
- let args_binding =
3017
- self.alloc_binding(args_name.clone(), BindingAnnotation::Unannotated, hygiene);
3011
+ let args_binding = self.alloc_binding(
3012
+ args_name.clone(),
3013
+ BindingAnnotation::Unannotated,
3014
+ HygieneId::ROOT,
3015
+ );
3018
3016
let args_pat = self.alloc_pat_desugared(Pat::Bind { id: args_binding, subpat: None });
3019
3017
self.add_definition_to_binding(args_binding, args_pat);
3020
3018
let elements = arguments
@@ -3057,8 +3055,11 @@ impl ExprCollector<'_> {
3057
3055
.collect();
3058
3056
let array =
3059
3057
self.alloc_expr_desugared(Expr::Array(Array::ElementList { elements: args }));
3060
- let args_binding =
3061
- self.alloc_binding(args_name.clone(), BindingAnnotation::Unannotated, hygiene);
3058
+ let args_binding = self.alloc_binding(
3059
+ args_name.clone(),
3060
+ BindingAnnotation::Unannotated,
3061
+ HygieneId::ROOT,
3062
+ );
3062
3063
let args_pat = self.alloc_pat_desugared(Pat::Bind { id: args_binding, subpat: None });
3063
3064
self.add_definition_to_binding(args_binding, args_pat);
3064
3065
let let_stmt2 = Statement::Let {
0 commit comments