---

yaml
---
r: 148469
b: refs/heads/try2
c: 3901228
h: refs/heads/master
i:
  148467: 12ba0c6
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 40df5a2e9ac81f445c7122a484618918b752a1e2
+refs/heads/try2: 39012288118146331add60f2b1c90b07b6a6c51b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/lint.rs

@@ -78,6 +78,7 @@ pub enum Lint {
     NonCamelCaseTypes,
     NonUppercaseStatics,
     NonUppercasePatternStatics,
+    UnnecessaryParens,
     TypeLimits,
     TypeOverflow,
     UnusedUnsafe,
@@ -162,7 +163,7 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
     ("while_true",
      LintSpec {
         lint: WhileTrue,
-        desc: "suggest using loop { } instead of while(true) { }",
+        desc: "suggest using `loop { }` instead of `while true { }`",
         default: warn
      }),
 
@@ -201,6 +202,13 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
          default: warn
      }),
 
+    ("unnecessary_parens",
+     LintSpec {
+        lint: UnnecessaryParens,
+        desc: "`if`, `match`, `while` and `return` do not need parentheses",
+        default: warn
+     }),
+
     ("managed_heap_memory",
      LintSpec {
         lint: ManagedHeapMemory,
@@ -1080,6 +1088,24 @@ fn check_pat_non_uppercase_statics(cx: &Context, p: &ast::Pat) {
     }
 }
 
+fn check_unnecessary_parens(cx: &Context, e: &ast::Expr) {
+    let (value, msg) = match e.node {
+        ast::ExprIf(cond, _, _) => (cond, "`if` condition"),
+        ast::ExprWhile(cond, _) => (cond, "`while` condition"),
+        ast::ExprMatch(head, _) => (head, "`match` head expression"),
+        ast::ExprRet(Some(value)) => (value, "`return` value"),
+        _ => return
+    };
+
+    match value.node {
+        ast::ExprParen(_) => {
+            cx.span_lint(UnnecessaryParens, value.span,
+                         format!("unnecessary parentheses around {}", msg))
+        }
+        _ => {}
+    }
+}
+
 fn check_unused_unsafe(cx: &Context, e: &ast::Expr) {
     match e.node {
         // Don't warn about generated blocks, that'll just pollute the output.
@@ -1438,6 +1464,7 @@ impl<'a> Visitor<()> for Context<'a> {
 
         check_while_true_expr(self, e);
         check_stability(self, e);
+        check_unnecessary_parens(self, e);
         check_unused_unsafe(self, e);
         check_unsafe_block(self, e);
         check_unnecessary_allocation(self, e);

branches/try2/src/test/compile-fail/lint-unnecessary-parens.rs

@@ -0,0 +1,25 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[deny(unnecessary_parens)];
+
+fn foo() -> int {
+    return (1); //~ ERROR unnecessary parentheses around `return` value
+}
+
+fn main() {
+    foo();
+
+    if (true) {} //~ ERROR unnecessary parentheses around `if` condition
+    while (true) {} //~ ERROR unnecessary parentheses around `while` condition
+    match (true) { //~ ERROR unnecessary parentheses around `match` head expression
+        _ => {}
+    }
+}