Merge pull request #1784 from birkenfeld/update

Demote never_loop lint to Allow for now

Author: birkenfeld

README.md

@@ -324,6 +324,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         enum_variants::STUTTER,
         if_not_else::IF_NOT_ELSE,
         items_after_statements::ITEMS_AFTER_STATEMENTS,
+        loops::NEVER_LOOP,
         matches::SINGLE_MATCH_ELSE,
         mem_forget::MEM_FORGET,
         methods::FILTER_MAP,
@@ -419,7 +420,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         loops::FOR_LOOP_OVER_RESULT,
         loops::ITER_NEXT_LOOP,
         loops::NEEDLESS_RANGE_LOOP,
-        loops::NEVER_LOOP,
         loops::REVERSE_RANGE_LOOP,
         loops::UNUSED_COLLECT,
         loops::WHILE_LET_LOOP,

clippy_lints/src/lib.rs

@@ -285,21 +285,24 @@ declare_lint! {
     "looping on a map using `iter` when `keys` or `values` would do"
 }
 
-/// **What it does:** Checks for loops that contain an unconditional `break`.
+/// **What it does:** Checks for loops that contain an unconditional `break`
+/// or `return`.
 ///
 /// **Why is this bad?** This loop never loops, all it does is obfuscating the
 /// code.
 ///
-/// **Known problems:** None.
+/// **Known problems:** Ignores `continue` statements in the loop that create
+/// nontrivial control flow. Therefore set to `Allow` by default.
+/// See https://github.com/Manishearth/rust-clippy/issues/1586
 ///
 /// **Example:**
 /// ```rust
 /// loop { ..; break; }
 /// ```
 declare_lint! {
     pub NEVER_LOOP,
-    Warn,
-    "any loop with an unconditional `break` statement"
+    Allow,
+    "any loop with an unconditional `break` or `return` statement"
 }
 
 #[derive(Copy, Clone)]

clippy_lints/src/loops.rs

@@ -76,8 +76,8 @@ pub fn range(expr: &hir::Expr) -> Option<Range> {
                     end: None,
                     limits: ast::RangeLimits::HalfOpen,
                 })
-            } else if match_path(path, &paths::RANGE_INCLUSIVE_NON_EMPTY_STD) ||
-                      match_path(path, &paths::RANGE_INCLUSIVE_NON_EMPTY) {
+            } else if match_path(path, &paths::RANGE_INCLUSIVE_STD) ||
+                      match_path(path, &paths::RANGE_INCLUSIVE) {
                 Some(Range {
                     start: get_field("start", fields),
                     end: get_field("end", fields),

clippy_lints/src/utils/higher.rs

@@ -49,8 +49,6 @@ pub const RANGE_FROM_STD: [&'static str; 3] = ["std", "ops", "RangeFrom"];
 pub const RANGE_FULL: [&'static str; 3] = ["core", "ops", "RangeFull"];
 pub const RANGE_FULL_STD: [&'static str; 3] = ["std", "ops", "RangeFull"];
 pub const RANGE_INCLUSIVE: [&'static str; 3] = ["core", "ops", "RangeInclusive"];
-pub const RANGE_INCLUSIVE_NON_EMPTY: [&'static str; 4] = ["core", "ops", "RangeInclusive", "NonEmpty"];
-pub const RANGE_INCLUSIVE_NON_EMPTY_STD: [&'static str; 4] = ["std", "ops", "RangeInclusive", "NonEmpty"];
 pub const RANGE_INCLUSIVE_STD: [&'static str; 3] = ["std", "ops", "RangeInclusive"];
 pub const RANGE_STD: [&'static str; 3] = ["std", "ops", "Range"];
 pub const RANGE_TO: [&'static str; 3] = ["core", "ops", "RangeTo"];

clippy_lints/src/utils/paths.rs

@@ -159,7 +159,7 @@ error: <-comparison of unit values detected. This will always be false
    |
    = note: `-D unit-cmp` implied by `-D warnings`
 
-error: aborting due to 18 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/absurd-extreme-comparisons.stderr

@@ -150,7 +150,7 @@ error: approximate value of `f{32, 64}::consts::SQRT_2` found. Consider using it
    |
    = note: `-D approx-constant` implied by `-D warnings`
 
-error: aborting due to 19 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/approx_const.stderr

@@ -87,7 +87,7 @@ error: floating-point arithmetic detected
    |
    = note: `-D float-arithmetic` implied by `-D warnings`
 
-error: aborting due to 11 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/arithmetic.stderr

@@ -150,7 +150,7 @@ error: range is out of bounds
    |
    = note: `-D out-of-bounds-indexing` implied by `-D warnings`
 
-error: aborting due to 19 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/array_indexing.stderr

@@ -166,7 +166,7 @@ error: manual implementation of an assign operation
    |
    = note: `-D assign-op-pattern` implied by `-D warnings`
 
-error: aborting due to 21 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.