Merge pull request #1784 from birkenfeld/update

Demote never_loop lint to Allow for now

README.md

@@ -295,7 +295,7 @@ name
 [needless_return](https://github.com/Manishearth/rust-clippy/wiki#needless_return)                                     | warn    | using a return statement like `return expr;` where an expression would suffice
 [needless_update](https://github.com/Manishearth/rust-clippy/wiki#needless_update)                                     | warn    | using `Foo { ..base }` when there are no missing fields
 [neg_multiply](https://github.com/Manishearth/rust-clippy/wiki#neg_multiply)                                           | warn    | multiplying integers with -1
-[never_loop](https://github.com/Manishearth/rust-clippy/wiki#never_loop)                                               | warn    | any loop with an unconditional `break` statement
+[never_loop](https://github.com/Manishearth/rust-clippy/wiki#never_loop)                                               | allow   | any loop with an unconditional `break` or `return` statement
 [new_ret_no_self](https://github.com/Manishearth/rust-clippy/wiki#new_ret_no_self)                                     | warn    | not returning `Self` in a `new` method
 [new_without_default](https://github.com/Manishearth/rust-clippy/wiki#new_without_default)                             | warn    | `fn new() -> Self` method without `Default` implementation
 [new_without_default_derive](https://github.com/Manishearth/rust-clippy/wiki#new_without_default_derive)               | warn    | `fn new() -> Self` without `#[derive]`able `Default` implementation

clippy_lints/src/lib.rs

@@ -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/loops.rs

@@ -285,12 +285,15 @@ 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
@@ -298,8 +301,8 @@ declare_lint! {
 /// ```
 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/utils/higher.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/paths.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_tests/examples/absurd-extreme-comparisons.stderr

@@ -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/approx_const.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/arithmetic.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/array_indexing.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/assign_ops.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`.
 

clippy_tests/examples/assign_ops2.stderr

@@ -62,7 +62,7 @@ error: variable appears on both sides of an assignment operation
    |
    = note: `-D misrefactored-assign-op` implied by `-D warnings`
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/attrs.stderr

@@ -22,7 +22,7 @@ error: the since field must contain a semver-compliant version
    |
    = note: `-D deprecated-semver` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/bit_masks.stderr

@@ -118,7 +118,7 @@ error: ineffective bit mask: `x | 1` compared to `8`, is the same as x compared
    |
    = note: `-D ineffective-bit-mask` implied by `-D warnings`
 
-error: aborting due to 15 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/blacklisted_name.stderr

@@ -110,7 +110,7 @@ error: use of a blacklisted/placeholder name `baz`
    |
    = note: `-D blacklisted-name` implied by `-D warnings`
 
-error: aborting due to 14 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/block_in_if_condition.stderr

@@ -54,7 +54,7 @@ error: this boolean expression can be simplified
    |
    = note: `-D nonminimal-bool` implied by `-D warnings`
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/bool_comparison.stderr

@@ -30,7 +30,7 @@ error: equality checks against false can be replaced by a negation
    |
    = note: `-D bool-comparison` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/booleans.stderr

@@ -136,7 +136,7 @@ help: try
    |     let _ = c != d || a != b;
    |     let _ = !(a == b && c == d);
 
-error: aborting due to 13 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/box_vec.stderr

@@ -7,7 +7,7 @@ error: you seem to be trying to use `Box<Vec<T>>`. Consider using just `Vec<T>`
    = note: `-D box-vec` implied by `-D warnings`
    = help: `Vec<T>` is already on the heap, `Box<Vec<T>>` makes an extra allocation.
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cast.stderr

@@ -358,7 +358,7 @@ error: casting to the same type is unnecessary (`bool` -> `bool`)
    |
    = note: `-D unnecessary-cast` implied by `-D warnings`
 
-error: aborting due to 45 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/char_lit_as_u8.stderr

@@ -8,7 +8,7 @@ error: casting character literal to u8. `char`s are 4 bytes wide in rust, so cas
   = help: Consider using a byte literal instead:
           b'a'
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cmp_nan.stderr

@@ -94,7 +94,7 @@ error: doomed comparison with NAN, use `std::{f32,f64}::is_nan()` instead
    |
    = note: `-D cmp-nan` implied by `-D warnings`
 
-error: aborting due to 12 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cmp_null.stderr

@@ -14,7 +14,7 @@ error: Comparing with null is better expressed by the .is_null() method
    |
    = note: `-D cmp-null` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cmp_owned.stderr

@@ -46,7 +46,7 @@ error: this creates an owned instance just for comparison
    |
    = note: `-D cmp-owned` implied by `-D warnings`
 
-error: aborting due to 6 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/collapsible_if.stderr

@@ -238,7 +238,7 @@ help: try
     |     println!("!")
     | }
 
-error: aborting due to 13 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/complex_types.stderr

@@ -118,7 +118,7 @@ error: very complex type used. Consider factoring parts into `type` definitions
    |
    = note: `-D type-complexity` implied by `-D warnings`
 
-error: aborting due to 15 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/copies.stderr

@@ -34,7 +34,7 @@ error: This else block is redundant.
             }
             
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cyclomatic_complexity.stderr

@@ -288,7 +288,7 @@ error: the function has a cyclomatic complexity of 8
     = note: `-D cyclomatic-complexity` implied by `-D warnings`
     = help: you could split it up into multiple smaller functions
 
-error: aborting due to 20 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/cyclomatic_complexity_attr_used.stderr

@@ -13,7 +13,7 @@ error: the function has a cyclomatic complexity of 3
    = note: `-D cyclomatic-complexity` implied by `-D warnings`
    = help: you could split it up into multiple smaller functions
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/derive.stderr

@@ -77,7 +77,7 @@ note: consider deriving `Clone` or removing `Copy`
 67 | | }
    | |_^
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/diverging_sub_expression.stderr

@@ -46,7 +46,7 @@ error: sub-expression diverges
    |
    = note: `-D diverging-sub-expression` implied by `-D warnings`
 
-error: aborting due to 6 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/dlist.stderr

@@ -52,7 +52,7 @@ error: I see you're using a LinkedList! Perhaps you meant some other data struct
    = note: `-D linkedlist` implied by `-D warnings`
    = help: a VecDeque might work
 
-error: aborting due to 6 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/doc.stderr

@@ -230,7 +230,7 @@ error: you should put `be_sure_we_got_to_the_end_of_it` between ticks in the doc
     |
     = note: `-D doc-markdown` implied by `-D warnings`
 
-error: aborting due to 29 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/double_neg.stderr

@@ -6,7 +6,7 @@ error: `--x` could be misinterpreted as pre-decrement by C programmers, is usual
   |
   = note: `-D double-neg` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/double_parens.stderr

@@ -38,7 +38,7 @@ error: Consider removing unnecessary double parentheses
    |
    = note: `-D double-parens` implied by `-D warnings`
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/drop_forget_copy.stderr

@@ -76,7 +76,7 @@ note: argument has type SomeStruct
 42 |     forget(s4);
    |            ^^
 
-error: aborting due to 6 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/drop_forget_ref.stderr

@@ -232,7 +232,7 @@ note: argument has type &SomeStruct
 59 |     std::mem::forget(&SomeStruct);
    |                      ^^^^^^^^^^^
 
-error: aborting due to 18 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/duplicate_underscore_argument.stderr

@@ -6,7 +6,7 @@ error: `darth` already exists, having another argument having almost the same na
   |
   = note: `-D duplicate-underscore-argument` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/empty_enum.stderr

@@ -11,7 +11,7 @@ help: consider using the uninhabited type `!` or a wrapper around it
 7 | enum Empty {}
   | ^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/entry.stderr

@@ -54,7 +54,7 @@ error: usage of `contains_key` followed by `insert` on a `BTreeMap`
    |
    = note: `-D map-entry` implied by `-D warnings`
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/enum_glob_use.stderr

@@ -14,7 +14,7 @@ error: don't use glob imports for enum variants
    |
    = note: `-D enum-glob-use` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/enum_variants.stderr

@@ -108,7 +108,7 @@ error: All variants have the same prefix: `With`
    = note: `-D pub-enum-variant-names` implied by `-D warnings`
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
-error: aborting due to 10 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/enums_clike.stderr

@@ -62,7 +62,7 @@ error: Clike enum variant discriminant is not portable to 32-bit targets
    |
    = note: `-D enum-clike-unportable-variant` implied by `-D warnings`
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/eq_op.stderr

@@ -264,7 +264,7 @@ error: taken reference of right operand
    |
    = note: `-D op-ref` implied by `-D warnings`
 
-error: aborting due to 33 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/eta.stderr

@@ -38,7 +38,7 @@ error: redundant closure found
    |
    = note: `-D redundant-closure` implied by `-D warnings`
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/eval_order_dependence.stderr

@@ -50,7 +50,7 @@ note: whether read occurs before this write depends on evaluation order
 21 |         x += { x = 20; 2 };
    |                ^^^^^^
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/filter_methods.stderr

@@ -42,7 +42,7 @@ error: called `filter_map(p).map(q)` on an `Iterator`. This is more succinctly e
    |
    = note: `-D filter-map` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/float_cmp.stderr

@@ -102,7 +102,7 @@ note: std::f32::EPSILON and std::f64::EPSILON are available.
 57 |     twice(x) != twice(ONE as f64);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/for_loop.stderr

@@ -493,7 +493,7 @@ error: you seem to want to iterate on a map's keys
 help: use the corresponding method
     |     for k in rm.keys() {
 
-error: aborting due to 49 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/format.stderr

@@ -22,7 +22,7 @@ error: useless use of `format!`
    |
    = note: `-D useless-format` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/formatting.stderr

@@ -93,7 +93,7 @@ error: possibly missing a comma here
    = note: `-D possible-missing-comma` implied by `-D warnings`
    = note: to remove this lint, add a comma or write the expr in a single line
 
-error: aborting due to 10 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/functions.stderr

@@ -95,7 +95,7 @@ error: this public function dereferences a raw pointer but is not marked `unsafe
    |
    = note: `-D not-unsafe-ptr-arg-deref` implied by `-D warnings`
 
-error: aborting due to 12 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/identity_op.stderr

@@ -54,7 +54,7 @@ error: the operation is ineffective. Consider reducing it to `x`
    |
    = note: `-D identity-op` implied by `-D warnings`
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/if_let_redundant_pattern_matching.stderr

@@ -30,7 +30,7 @@ error: redundant pattern matching, consider using `is_some()`
    |
    = note: `-D if-let-redundant-pattern-matching` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/if_not_else.stderr

@@ -24,7 +24,7 @@ error: Unnecessary `!=` operation
    = note: `-D if-not-else` implied by `-D warnings`
    = help: change to `==` and swap the blocks of the if/else
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/invalid_upcast_comparisons.stderr

@@ -214,7 +214,7 @@ error: because of the numeric bounds on `u8` prior to casting, this expression i
    |
    = note: `-D invalid-upcast-comparisons` implied by `-D warnings`
 
-error: aborting due to 27 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/item_after_statement.stderr

@@ -14,7 +14,7 @@ error: adding items after statements is confusing, since items exist from the st
    |
    = note: `-D items-after-statements` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/large_enum_variant.stderr

@@ -67,7 +67,7 @@ error: large size difference between variants
 help: consider boxing the large fields to reduce the total size of the enum
    |     StructLikeLarge2 { x: Box<[i32; 8000]> },
 
-error: aborting due to 6 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/len_zero.stderr

@@ -104,7 +104,7 @@ error: length comparison to zero
     |
     = note: `-D len-zero` 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/let_if_seq.stderr

@@ -50,7 +50,7 @@ error: `if _ { .. } else { .. }` is an expression
     = note: `-D useless-let-if-seq` implied by `-D warnings`
     = note: you might not need `mut` at all
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/let_return.stderr

@@ -24,7 +24,7 @@ note: this expression can be directly returned
 15 |         let x = 5;
    |                 ^
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/let_unit.stderr

@@ -14,7 +14,7 @@ error: this let-binding has unit value. Consider omitting `let _a =`
    |
    = note: `-D let-unit-value` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/lifetimes.stderr

@@ -112,7 +112,7 @@ error: explicit lifetimes given in parameter types where they could be elided
     |
     = note: `-D needless-lifetimes` implied by `-D warnings`
 
-error: aborting due to 14 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/lint_pass.stderr

@@ -6,7 +6,7 @@ error: the lint `MISSING_LINT` is not added to any `LintPass`
    |
    = note: `-D lint-without-lint-pass` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/literals.stderr

@@ -74,7 +74,7 @@ help: if you mean to use a decimal constant, remove the `0` to remove confusion:
 help: if you mean to use an octal constant, use `0o`:
    |     let fail8 = 0o123;
 
-error: aborting due to 9 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/map_clone.stderr

@@ -108,7 +108,7 @@ error: you seem to be using .map() to clone the contents of an Option, consider
    = help: try
            x.as_ref().cloned()
 
-error: aborting due to 11 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/matches.stderr

@@ -289,7 +289,7 @@ error: Err(_) will match all errors, maybe not a good idea
     = note: `-D match-wild-err-arm` implied by `-D warnings`
     = note: to remove this warning, match each error seperately or use unreachable macro
 
-error: aborting due to 26 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/mem_forget.stderr

@@ -22,7 +22,7 @@ error: usage of mem::forget on Drop type
    |
    = note: `-D mem-forget` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/methods.stderr

@@ -760,7 +760,7 @@ error: called `cloned().collect()` on a slice to create a `Vec`. Calling `to_vec
     |
     = note: `-D iter-cloned-collect` implied by `-D warnings`
 
-error: aborting due to 89 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/min_max.stderr

@@ -54,7 +54,7 @@ error: this min/max combination leads to constant result
    |
    = note: `-D min-max` implied by `-D warnings`
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/missing-doc.stderr

@@ -348,7 +348,7 @@ error: missing documentation for a function
     |
     = note: `-D missing-docs-in-private-items` implied by `-D warnings`
 
-error: aborting due to 40 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/module_inception.stderr

@@ -18,7 +18,7 @@ error: module has the same name as its containing module
    |
    = note: `-D module-inception` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/modulo_one.stderr

@@ -6,7 +6,7 @@ error: any number modulo 1 will be 0
   |
   = note: `-D modulo-one` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/mut_from_ref.stderr

@@ -63,7 +63,7 @@ note: immutable borrow here
 32 | fn fail_double<'a, 'b>(x: &'a u32, y: &'a u32, z: &'b mut u32) -> &'a mut u32 {
    |                           ^^^^^^^     ^^^^^^^
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/mut_mut.stderr

@@ -105,7 +105,7 @@ error: generally you want to avoid `&mut &mut _` if possible
    |
    = note: `-D mut-mut` implied by `-D warnings`
 
-error: aborting due to 13 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/mut_reference.stderr

@@ -22,7 +22,7 @@ error: The function/method "takes_an_immutable_reference" doesn't need a mutable
    |
    = note: `-D unnecessary-mut-passed` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/mutex_atomic.stderr

@@ -54,7 +54,7 @@ error: Consider using an AtomicIsize instead of a Mutex here. If you just want t
    |
    = note: `-D mutex-integer` implied by `-D warnings`
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/needless_bool.stderr

@@ -86,7 +86,7 @@ error: this if-then-else expression returns a bool literal
    |
    = note: `-D needless-bool` 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/needless_borrow.stderr

@@ -30,7 +30,7 @@ error: this pattern creates a reference to a reference
    |
    = note: `-D needless-borrow` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/needless_continue.stderr

@@ -56,7 +56,7 @@ error: There is no need for an explicit `else` block for this `if` expression
            println!("Jabber");
            ...
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/needless_pass_by_value.stderr

@@ -62,7 +62,7 @@ help: consider taking a reference instead
    |     let Wrapper(ref t) = *y; // not moved
    |     let Wrapper(_) = *y; // still not moved
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/needless_return.stderr

@@ -62,7 +62,7 @@ error: unneeded return statement
    |
    = note: `-D needless-return` implied by `-D warnings`
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/needless_update.stderr

@@ -6,7 +6,7 @@ error: struct update has no effect, all the fields in the struct have already be
    |
    = note: `-D needless-update` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/neg_multiply.stderr

@@ -14,7 +14,7 @@ error: Negation by multiplying with -1
    |
    = note: `-D neg-multiply` implied by `-D warnings`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/never_loop.stderr

@@ -34,7 +34,7 @@ error: this loop never actually loops
    |
    = note: `-D never-loop` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/new_without_default.stderr

@@ -34,7 +34,7 @@ help: try this
    | 
 ...
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/no_effect.stderr

@@ -350,7 +350,7 @@ error: statement can be reduced
    |
    = note: `-D unnecessary-operation` implied by `-D warnings`
 
-error: aborting due to 44 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/non_expressive_names.stderr

@@ -141,7 +141,7 @@ error: 5th binding whose name is just one char
     |
     = note: `-D many-single-char-names` 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/ok_if_let.stderr

@@ -11,7 +11,7 @@ error: Matching on `Some` with `ok()` is redundant
    = note: `-D if-let-some-result` implied by `-D warnings`
    = help: Consider matching on `Ok(y)` and removing the call to `ok` instead
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/op_ref.stderr

@@ -8,7 +8,7 @@ error: needlessly taken reference of both operands
 help: use the values directly
    |     let foo = 5 - 6;
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/open_options.stderr

@@ -54,7 +54,7 @@ error: the method "truncate" is called more than once
    |
    = note: `-D nonsensical-open-options` implied by `-D warnings`
 
-error: aborting due to 7 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/overflow_check_conditional.stderr

@@ -62,7 +62,7 @@ error: You are trying to use classic C underflow conditions that will fail in Ru
    |
    = note: `-D overflow-check-conditional` implied by `-D warnings`
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/panic.stderr

@@ -31,7 +31,7 @@ error: you probably are missing some parameter in your format string
    = note: `-D panic-params` implied by `-D warnings`
    = note: this error originates in a macro outside of the current crate
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/partialeq_ne_impl.stderr

@@ -6,7 +6,7 @@ error: re-implementing `PartialEq::ne` is unnecessary
    |
    = note: `-D partialeq-ne-impl` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/patterns.stderr

@@ -6,7 +6,7 @@ error: the `y @ _` pattern can be written as just `y`
    |
    = note: `-D redundant-pattern` implied by `-D warnings`
 
-error: aborting due to previous error
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/precedence.stderr

@@ -70,7 +70,7 @@ error: unary minus has lower precedence than method call
    |
    = note: `-D precedence` implied by `-D warnings`
 
-error: aborting due to 9 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/print.stderr

@@ -62,7 +62,7 @@ error: use of `Debug`-based formatting
    |
    = note: `-D use-debug` implied by `-D warnings`
 
-error: aborting due to 8 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/print_with_newline.stderr

@@ -30,7 +30,7 @@ error: using `print!()` with a format string that ends in a newline, consider us
   |
   = note: `-D print-with-newline` implied by `-D warnings`
 
-error: aborting due to 4 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/ptr_arg.stderr

@@ -22,7 +22,7 @@ error: writing `&Vec<_>` instead of `&[_]` involves one more reference and canno
    |
    = note: `-D ptr-arg` implied by `-D warnings`
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/range.stderr

@@ -38,7 +38,7 @@ error: It is more idiomatic to use v1.iter().enumerate()
    |
    = note: `-D range-zip-with-len` implied by `-D warnings`
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.
 

clippy_tests/examples/redundant_closure_call.stderr

@@ -38,7 +38,7 @@ error: Try not to call a closure in the expression where it is declared.
    |
    = note: `-D redundant-closure-call` implied by `-D warnings`
 
-error: aborting due to 5 previous errors
+error: aborting due to previous error(s)
 
 error: Could not compile `clippy_tests`.