@@ -48,10 +48,10 @@ impl<'a> Unparser<'a> {
48
48
}
49
49
50
50
fn unparse_expr < U > ( & mut self , ast : & Expr < U > , level : u8 ) -> fmt:: Result {
51
- macro_rules! opprec {
52
- ( $opty : ident, $x: expr, $enu: path, $( $var: ident( $op: literal, $prec: ident) ) ,* $( , ) ?) => {
51
+ macro_rules! op_prec {
52
+ ( $op_ty : ident, $x: expr, $enu: path, $( $var: ident( $op: literal, $prec: ident) ) ,* $( , ) ?) => {
53
53
match $x {
54
- $( <$enu>:: $var => ( opprec !( @space $opty , $op) , precedence:: $prec) , ) *
54
+ $( <$enu>:: $var => ( op_prec !( @space $op_ty , $op) , precedence:: $prec) , ) *
55
55
}
56
56
} ;
57
57
( @space bin, $op: literal) => {
@@ -72,7 +72,7 @@ impl<'a> Unparser<'a> {
72
72
}
73
73
match & ast. node {
74
74
ExprKind :: BoolOp { op, values } => {
75
- let ( op, prec) = opprec ! ( bin, op, Boolop , And ( "and" , AND ) , Or ( "or" , OR ) ) ;
75
+ let ( op, prec) = op_prec ! ( bin, op, Boolop , And ( "and" , AND ) , Or ( "or" , OR ) ) ;
76
76
group_if ! ( prec, {
77
77
let mut first = true ;
78
78
for val in values {
@@ -89,8 +89,8 @@ impl<'a> Unparser<'a> {
89
89
} )
90
90
}
91
91
ExprKind :: BinOp { left, op, right } => {
92
- let rassoc = matches ! ( op, Operator :: Pow ) ;
93
- let ( op, prec) = opprec ! (
92
+ let right_associative = matches ! ( op, Operator :: Pow ) ;
93
+ let ( op, prec) = op_prec ! (
94
94
bin,
95
95
op,
96
96
Operator ,
@@ -109,13 +109,13 @@ impl<'a> Unparser<'a> {
109
109
FloorDiv ( "//" , TERM ) ,
110
110
) ;
111
111
group_if ! ( prec, {
112
- self . unparse_expr( left, prec + rassoc as u8 ) ?;
112
+ self . unparse_expr( left, prec + right_associative as u8 ) ?;
113
113
self . p( op) ?;
114
- self . unparse_expr( right, prec + !rassoc as u8 ) ?;
114
+ self . unparse_expr( right, prec + !right_associative as u8 ) ?;
115
115
} )
116
116
}
117
117
ExprKind :: UnaryOp { op, operand } => {
118
- let ( op, prec) = opprec ! (
118
+ let ( op, prec) = op_prec ! (
119
119
un,
120
120
op,
121
121
crate :: Unaryop ,
@@ -131,8 +131,8 @@ impl<'a> Unparser<'a> {
131
131
}
132
132
ExprKind :: Lambda { args, body } => {
133
133
group_if ! ( precedence:: TEST , {
134
- let npos = args. args. len( ) + args. posonlyargs. len( ) ;
135
- self . p( if npos > 0 { "lambda " } else { "lambda" } ) ?;
134
+ let pos = args. args. len( ) + args. posonlyargs. len( ) ;
135
+ self . p( if pos > 0 { "lambda " } else { "lambda" } ) ?;
136
136
self . unparse_args( args) ?;
137
137
write!( self , ": {}" , * * body) ?;
138
138
} )
@@ -260,7 +260,7 @@ impl<'a> Unparser<'a> {
260
260
[ ] ,
261
261
) = ( & * * args, & * * keywords)
262
262
{
263
- // make sure a single genexp doesn't get double parens
263
+ // make sure a single genexpr doesn't get double parens
264
264
self . unparse_expr ( elt, precedence:: TEST ) ?;
265
265
self . unparse_comp ( generators) ?;
266
266
} else {
@@ -287,7 +287,7 @@ impl<'a> Unparser<'a> {
287
287
conversion,
288
288
format_spec,
289
289
} => self . unparse_formatted ( value, * conversion, format_spec. as_deref ( ) ) ?,
290
- ExprKind :: JoinedStr { values } => self . unparse_joinedstr ( values, false ) ?,
290
+ ExprKind :: JoinedStr { values } => self . unparse_joined_str ( values, false ) ?,
291
291
ExprKind :: Constant { value, kind } => {
292
292
if let Some ( kind) = kind {
293
293
self . p ( kind) ?;
@@ -490,7 +490,7 @@ impl<'a> Unparser<'a> {
490
490
unreachable ! ( )
491
491
}
492
492
}
493
- ExprKind :: JoinedStr { values } => self . unparse_joinedstr ( values, is_spec) ,
493
+ ExprKind :: JoinedStr { values } => self . unparse_joined_str ( values, is_spec) ,
494
494
ExprKind :: FormattedValue {
495
495
value,
496
496
conversion,
@@ -505,7 +505,7 @@ impl<'a> Unparser<'a> {
505
505
self . p ( & s)
506
506
}
507
507
508
- fn unparse_joinedstr < U > ( & mut self , values : & [ Expr < U > ] , is_spec : bool ) -> fmt:: Result {
508
+ fn unparse_joined_str < U > ( & mut self , values : & [ Expr < U > ] , is_spec : bool ) -> fmt:: Result {
509
509
if is_spec {
510
510
self . unparse_fstring_body ( values, is_spec)
511
511
} else {
0 commit comments