Pretty-print parenthesis around binary in postfix match

Signed-off-by: Sasha Pourcelot <[email protected]>

Author: scrabsha

compiler/rustc_ast_pretty/src/pprust/state/expr.rs

@@ -488,7 +488,19 @@ impl<'a> State<'a> {
                         self.space();
                     }
                     MatchKind::Postfix => {
+                        let need_par = expr.precedence().order() >= parser::PREC_RANGE
+                            && expr.precedence().order() < parser::PREC_PREFIX;
+
+                        if need_par {
+                            // avoid printing `a + b.match {}`, print
+                            // `(a + b).match {}` instead.
+                            self.popen();
+                        }
                         self.print_expr_as_cond(expr);
+                        if need_par {
+                            self.pclose();
+                        }
+
                         self.word_nbsp(".match");
                     }
                 }

tests/pretty/postfix-match/precedence.pp

@@ -0,0 +1,25 @@
+#![feature(prelude_import)]
+#![no_std]
+#![feature(postfix_match)]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
+#[macro_use]
+extern crate std;
+
+//@ pretty-mode:expanded
+//@ pp-exact:precedence.pp
+
+macro_rules! repro { ($e:expr) => { $e.match { _ => {} } }; }
+
+pub fn main() {
+    let a;
+    (
+        { 1 } + 1).match {
+        _ => {}
+    };
+    (4 as usize).match { _ => {} };
+    (return).match { _ => {} };
+    (a = 42).match { _ => {} };
+    (|| {}).match { _ => {} };
+    (42..101).match { _ => {} };
+}

tests/pretty/postfix-match/precedence.rs

@@ -0,0 +1,23 @@
+#![feature(postfix_match)]
+
+//@ pretty-mode:expanded
+//@ pp-exact:precedence.pp
+
+macro_rules! repro {
+    ($e:expr) => {
+        $e.match {
+            _ => {}
+        }
+    };
+}
+
+pub fn main() {
+    let a;
+
+    repro!({ 1 } + 1);
+    repro!(4 as usize);
+    repro!(return);
+    repro!(a = 42);
+    repro!(|| {});
+    repro!(42..101);
+}