Rework ast::BinOpKind::to_string and ast::UnOp::to_string.

nnethercote · nnethercote · commit d84d8d26042e · 2023-11-28T09:42:07.000+11:00
- Rename them both `as_str`, which is the typical name for a function
  that returns a `&amp;str`. (`to_string` is appropriate for functions
  returning `String` or maybe `Cow&lt;'a, str&gt;`.)
- Change `UnOp::as_str` from an associated function (weird!) to a
  method.
- Avoid needless `self` dereferences.
diff --git a/src/expr.rs b/src/expr.rs
@@ -1933,7 +1933,7 @@ fn rewrite_unary_op(
     shape: Shape,
 ) -> Option<String> {
     // For some reason, an UnOp is not spanned like BinOp!
-    rewrite_unary_prefix(context, ast::UnOp::to_string(op), expr, shape)
+    rewrite_unary_prefix(context, op.as_str(), expr, shape)
 }
 
 pub(crate) enum RhsAssignKind<'ast> {
diff --git a/src/pairs.rs b/src/pairs.rs
@@ -339,7 +339,7 @@ impl FlattenPair for ast::Expr {
                     if let Some(pop) = stack.pop() {
                         match pop.kind {
                             ast::ExprKind::Binary(op, _, ref rhs) => {
-                                separators.push(op.node.to_string());
+                                separators.push(op.node.as_str());
                                 node = rhs;
                             }
                             _ => unreachable!(),

Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,7 @@ fn rewrite_unary_op(`
`1933`	`1933`	`shape: Shape,`
`1934`	`1934`	`) -> Option<String> {`
`1935`	`1935`	`// For some reason, an UnOp is not spanned like BinOp!`
`1936`		`- rewrite_unary_prefix(context, ast::UnOp::to_string(op), expr, shape)`
	`1936`	`+ rewrite_unary_prefix(context, op.as_str(), expr, shape)`
`1937`	`1937`	`}`
`1938`	`1938`
`1939`	`1939`	`pub(crate) enum RhsAssignKind<'ast> {`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ impl FlattenPair for ast::Expr {`
`339`	`339`	`if let Some(pop) = stack.pop() {`
`340`	`340`	`match pop.kind {`
`341`	`341`	`ast::ExprKind::Binary(op, _, ref rhs) => {`
`342`		`- separators.push(op.node.to_string());`
	`342`	`+ separators.push(op.node.as_str());`
`343`	`343`	`node = rhs;`
`344`	`344`	`}`
`345`	`345`	`_ => unreachable!(),`