Wrap cast expr in parens when the ty ends with empty angle brackets

src/expr.rs

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 use std::cmp::min;
+use std::ops::Deref;
 
 use itertools::Itertools;
 use rustc_ast::token::{Delimiter, LitKind};
@@ -95,13 +96,15 @@ pub(crate) fn format_expr(
         ast::ExprKind::Binary(op, ref lhs, ref rhs) => {
             // FIXME: format comments between operands and operator
             rewrite_all_pairs(expr, shape, context).or_else(|| {
+                let wrap_lhs_in_parns = lhs_needs_parens(&op, lhs);
                 rewrite_pair(
                     &**lhs,
                     &**rhs,
                     PairParts::infix(&format!(" {} ", context.snippet(op.span))),
                     context,
                     shape,
                     context.config.binop_separator(),
+                    wrap_lhs_in_parns,
                 )
             })
         }
@@ -240,6 +243,7 @@ pub(crate) fn format_expr(
             context,
             shape,
             SeparatorPlace::Front,
+            false,
         ),
         ast::ExprKind::Type(ref expr, ref ty) => rewrite_pair(
             &**expr,
@@ -248,6 +252,7 @@ pub(crate) fn format_expr(
             context,
             shape,
             SeparatorPlace::Back,
+            false,
         ),
         ast::ExprKind::Index(ref expr, ref index) => {
             rewrite_index(&**expr, &**index, context, shape)
@@ -259,6 +264,7 @@ pub(crate) fn format_expr(
             context,
             shape,
             SeparatorPlace::Back,
+            false,
         ),
         ast::ExprKind::Range(ref lhs, ref rhs, limits) => {
             let delim = match limits {
@@ -313,6 +319,7 @@ pub(crate) fn format_expr(
                         context,
                         shape,
                         context.config.binop_separator(),
+                        false,
                     )
                 }
                 (None, Some(rhs)) => {
@@ -409,6 +416,35 @@ pub(crate) fn format_expr(
         })
 }
 
+/// Check if we need to wrap the lhs of a binary expression in parens to avoid compilation errors.
+/// See <https://github.com/rust-lang/rustfmt/issues/4621>
+pub(crate) fn lhs_needs_parens(op: &ast::BinOp, lhs: &ast::Expr) -> bool {
+    let is_lt_or_shl = matches!(op.node, ast::BinOpKind::Shl | ast::BinOpKind::Lt);
+    if !is_lt_or_shl {
+        return false;
+    }
+    matches!(
+        lhs.kind,
+        ast::ExprKind::Cast(_, ref ty) if ty_ends_with_empty_angle_brackets(ty)
+    )
+}
+
+/// Check if they type ends with an empty generic argument list e.g. `i32<>`.
+fn ty_ends_with_empty_angle_brackets(ty: &ast::Ty) -> bool {
+    if let ast::TyKind::Path(_, path) = &ty.kind {
+        matches!(
+            path.segments.last(),
+            Some(ast::PathSegment {args: Some(generic_args), ..})
+            if matches!(
+                generic_args.deref(),
+                ast::GenericArgs::AngleBracketed(bracket_args) if bracket_args.args.is_empty()
+            )
+        )
+    } else {
+        false
+    }
+}
+
 pub(crate) fn rewrite_array<'a, T: 'a + IntoOverflowableItem<'a>>(
     name: &'a str,
     exprs: impl Iterator<Item = &'a T>,

src/pairs.rs

@@ -2,6 +2,7 @@ use rustc_ast::ast;
 
 use crate::config::lists::*;
 use crate::config::IndentStyle;
+use crate::expr::lhs_needs_parens;
 use crate::rewrite::{Rewrite, RewriteContext};
 use crate::shape::Shape;
 use crate::utils::{
@@ -157,23 +158,31 @@ pub(crate) fn rewrite_pair<LHS, RHS>(
     context: &RewriteContext<'_>,
     shape: Shape,
     separator_place: SeparatorPlace,
+    wrap_lhs_in_parens: bool,
 ) -> Option<String>
 where
     LHS: Rewrite,
     RHS: Rewrite,
 {
     let tab_spaces = context.config.tab_spaces();
     let lhs_overhead = match separator_place {
+        SeparatorPlace::Back if wrap_lhs_in_parens => {
+            shape.used_width() + pp.prefix.len() + pp.infix.trim_end().len() + 2
+        }
         SeparatorPlace::Back => shape.used_width() + pp.prefix.len() + pp.infix.trim_end().len(),
         SeparatorPlace::Front => shape.used_width(),
     };
     let lhs_shape = Shape {
         width: context.budget(lhs_overhead),
         ..shape
     };
-    let lhs_result = lhs
-        .rewrite(context, lhs_shape)
-        .map(|lhs_str| format!("{}{}", pp.prefix, lhs_str))?;
+    let lhs_result = lhs.rewrite(context, lhs_shape).map(|lhs_str| {
+        if wrap_lhs_in_parens {
+            format!("{}({})", pp.prefix, lhs_str)
+        } else {
+            format!("{}{}", pp.prefix, lhs_str)
+        }
+    })?;
 
     // Try to put both lhs and rhs on the same line.
     let rhs_orig_result = shape
@@ -298,6 +307,12 @@ impl FlattenPair for ast::Expr {
                         match pop.kind {
                             ast::ExprKind::Binary(op, _, ref rhs) => {
                                 separators.push(op.node.to_string());
+                                if lhs_needs_parens(&op, node) {
+                                    // safe to unwrap since we just pushed onto the list
+                                    let (lhs, rw) = list.pop().unwrap();
+                                    let rw = rw.and_then(|s| Some(format!("({})", s)));
+                                    list.push((lhs, rw));
+                                }
                                 node = rhs;
                             }
                             _ => unreachable!(),

src/patterns.rs

@@ -217,6 +217,7 @@ impl Rewrite for Pat {
                     context,
                     shape,
                     SeparatorPlace::Front,
+                    false,
                 )
             }
             PatKind::Ref(ref pat, mutability) => {

src/types.rs

@@ -809,6 +809,7 @@ impl Rewrite for ast::Ty {
                 context,
                 shape,
                 SeparatorPlace::Back,
+                false,
             ),
             ast::TyKind::Infer => {
                 if shape.width >= 1 {

tests/source/issue-4621/do_not_wrap_in_parens.rs

@@ -0,0 +1,13 @@
+fn less_than_or_equal_operand() {
+    let x: u32 = 100;
+    if x as i32<> <= 0 {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_no_wrap() {
+    let x: u32 = 100;
+    if x as i32 <= 0 && x as i32 <= 0 && x as i32 <= 0 && x as i32 <= 0 && x as i32 <= 0 && x as i32 <= 0 && x as i32 <= 0 {
+        // ...
+    }
+}

tests/source/issue-4621/wrap_in_parens.rs

@@ -0,0 +1,27 @@
+fn less_than_operand() {
+    let x: u32 = 100;
+    if x as i32<> < 0 {
+        // ...
+    }
+}
+
+fn left_shift_operand() {
+    let x: u32 = 100;
+    if x as i32<> << 1 < 0 {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_wrap_all() {
+    let x: u32 = 100;
+    if x as i32<> < 0 && x as i32<> < 0 && x as i32<> << 1 < 0 && x as i32<> << 1 < 0 && x as i32<> << 1 < 0 && x as i32<> << 1 < 0 {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_wrap_some() {
+    let x: u32 = 100;
+    if x as i32<> < 0 && x as i32<> <= 0 && x as i32<> << 1 < 0 && x as i32<> <= 0 && x as i32<> << 1 < 0 {
+        // ...
+    }
+}

tests/target/issue-4621/do_not_wrap_in_parens.rs

@@ -0,0 +1,20 @@
+fn less_than_or_equal_operand() {
+    let x: u32 = 100;
+    if x as i32 <= 0 {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_no_wrap() {
+    let x: u32 = 100;
+    if x as i32 <= 0
+        && x as i32 <= 0
+        && x as i32 <= 0
+        && x as i32 <= 0
+        && x as i32 <= 0
+        && x as i32 <= 0
+        && x as i32 <= 0
+    {
+        // ...
+    }
+}

tests/target/issue-4621/wrap_in_parens.rs

@@ -0,0 +1,38 @@
+fn less_than_operand() {
+    let x: u32 = 100;
+    if (x as i32) < 0 {
+        // ...
+    }
+}
+
+fn left_shift_operand() {
+    let x: u32 = 100;
+    if (x as i32) << 1 < 0 {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_wrap_all() {
+    let x: u32 = 100;
+    if (x as i32) < 0
+        && (x as i32) < 0
+        && (x as i32) << 1 < 0
+        && (x as i32) << 1 < 0
+        && (x as i32) << 1 < 0
+        && (x as i32) << 1 < 0
+    {
+        // ...
+    }
+}
+
+fn long_binary_op_chain_wrap_some() {
+    let x: u32 = 100;
+    if (x as i32) < 0
+        && x as i32 <= 0
+        && (x as i32) << 1 < 0
+        && x as i32 <= 0
+        && (x as i32) << 1 < 0
+    {
+        // ...
+    }
+}