@@ -48,10 +48,10 @@ impl<'a> Unparser<'a> {
4848 }
4949
5050 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) ) ,* $( , ) ?) => {
5353 match $x {
54- $( <$enu>:: $var => ( opprec !( @space $opty , $op) , precedence:: $prec) , ) *
54+ $( <$enu>:: $var => ( op_prec !( @space $op_ty , $op) , precedence:: $prec) , ) *
5555 }
5656 } ;
5757 ( @space bin, $op: literal) => {
@@ -72,7 +72,7 @@ impl<'a> Unparser<'a> {
7272 }
7373 match & ast. node {
7474 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 ) ) ;
7676 group_if ! ( prec, {
7777 let mut first = true ;
7878 for val in values {
@@ -89,8 +89,8 @@ impl<'a> Unparser<'a> {
8989 } )
9090 }
9191 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 ! (
9494 bin,
9595 op,
9696 Operator ,
@@ -109,13 +109,13 @@ impl<'a> Unparser<'a> {
109109 FloorDiv ( "//" , TERM ) ,
110110 ) ;
111111 group_if ! ( prec, {
112- self . unparse_expr( left, prec + rassoc as u8 ) ?;
112+ self . unparse_expr( left, prec + right_associative as u8 ) ?;
113113 self . p( op) ?;
114- self . unparse_expr( right, prec + !rassoc as u8 ) ?;
114+ self . unparse_expr( right, prec + !right_associative as u8 ) ?;
115115 } )
116116 }
117117 ExprKind :: UnaryOp { op, operand } => {
118- let ( op, prec) = opprec ! (
118+ let ( op, prec) = op_prec ! (
119119 un,
120120 op,
121121 crate :: Unaryop ,
@@ -131,8 +131,8 @@ impl<'a> Unparser<'a> {
131131 }
132132 ExprKind :: Lambda { args, body } => {
133133 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" } ) ?;
136136 self . unparse_args( args) ?;
137137 write!( self , ": {}" , * * body) ?;
138138 } )
@@ -260,7 +260,7 @@ impl<'a> Unparser<'a> {
260260 [ ] ,
261261 ) = ( & * * args, & * * keywords)
262262 {
263- // make sure a single genexp doesn't get double parens
263+ // make sure a single genexpr doesn't get double parens
264264 self . unparse_expr ( elt, precedence:: TEST ) ?;
265265 self . unparse_comp ( generators) ?;
266266 } else {
@@ -287,7 +287,7 @@ impl<'a> Unparser<'a> {
287287 conversion,
288288 format_spec,
289289 } => 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 ) ?,
291291 ExprKind :: Constant { value, kind } => {
292292 if let Some ( kind) = kind {
293293 self . p ( kind) ?;
@@ -490,7 +490,7 @@ impl<'a> Unparser<'a> {
490490 unreachable ! ( )
491491 }
492492 }
493- ExprKind :: JoinedStr { values } => self . unparse_joinedstr ( values, is_spec) ,
493+ ExprKind :: JoinedStr { values } => self . unparse_joined_str ( values, is_spec) ,
494494 ExprKind :: FormattedValue {
495495 value,
496496 conversion,
@@ -505,7 +505,7 @@ impl<'a> Unparser<'a> {
505505 self . p ( & s)
506506 }
507507
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 {
509509 if is_spec {
510510 self . unparse_fstring_body ( values, is_spec)
511511 } else {
0 commit comments