Remove never_type feature

flip1995 · flip1995 · commit 3c308b86c81e · 2019-11-22T13:47:33.000+01:00
Stablized in rust-lang/rust#65355
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
@@ -2,7 +2,6 @@
 
 #![feature(box_syntax)]
 #![feature(box_patterns)]
-#![feature(never_type)]
 #![feature(rustc_private)]
 #![feature(slice_patterns)]
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/diverging_sub_expression.rs b/tests/ui/diverging_sub_expression.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
 #![warn(clippy::diverging_sub_expression)]
 #![allow(clippy::match_same_arms, clippy::logic_bug)]
 
diff --git a/tests/ui/diverging_sub_expression.stderr b/tests/ui/diverging_sub_expression.stderr
@@ -1,37 +1,37 @@
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:21:10
+  --> $DIR/diverging_sub_expression.rs:20:10
    |
 LL |     b || diverge();
    |          ^^^^^^^^^
    |
    = note: `-D clippy::diverging-sub-expression` implied by `-D warnings`
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:22:10
+  --> $DIR/diverging_sub_expression.rs:21:10
    |
 LL |     b || A.foo();
    |          ^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:31:26
+  --> $DIR/diverging_sub_expression.rs:30:26
    |
 LL |             6 => true || return,
    |                          ^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:32:26
+  --> $DIR/diverging_sub_expression.rs:31:26
    |
 LL |             7 => true || continue,
    |                          ^^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:35:26
+  --> $DIR/diverging_sub_expression.rs:34:26
    |
 LL |             3 => true || diverge(),
    |                          ^^^^^^^^^
 
 error: sub-expression diverges
-  --> $DIR/diverging_sub_expression.rs:40:26
+  --> $DIR/diverging_sub_expression.rs:39:26
    |
 LL |             _ => true || break,
    |                          ^^^^^
diff --git a/tests/ui/infallible_destructuring_match.fixed b/tests/ui/infallible_destructuring_match.fixed
@@ -1,5 +1,5 @@
 // run-rustfix
-#![feature(exhaustive_patterns, never_type)]
+#![feature(exhaustive_patterns)]
 #![allow(dead_code, unreachable_code, unused_variables)]
 #![allow(clippy::let_and_return)]
 
diff --git a/tests/ui/infallible_destructuring_match.rs b/tests/ui/infallible_destructuring_match.rs
@@ -1,5 +1,5 @@
 // run-rustfix
-#![feature(exhaustive_patterns, never_type)]
+#![feature(exhaustive_patterns)]
 #![allow(dead_code, unreachable_code, unused_variables)]
 #![allow(clippy::let_and_return)]
 
diff --git a/tests/ui/must_use_candidates.fixed b/tests/ui/must_use_candidates.fixed
@@ -1,5 +1,4 @@
 // run-rustfix
-#![feature(never_type)]
 #![allow(unused_mut)]
 #![warn(clippy::must_use_candidate)]
 use std::rc::Rc;
diff --git a/tests/ui/must_use_candidates.rs b/tests/ui/must_use_candidates.rs
@@ -1,5 +1,4 @@
 // run-rustfix
-#![feature(never_type)]
 #![allow(unused_mut)]
 #![warn(clippy::must_use_candidate)]
 use std::rc::Rc;
diff --git a/tests/ui/must_use_candidates.stderr b/tests/ui/must_use_candidates.stderr
@@ -1,31 +1,31 @@
 error: this function could have a `#[must_use]` attribute
-  --> $DIR/must_use_candidates.rs:12:1
+  --> $DIR/must_use_candidates.rs:11:1
    |
 LL | pub fn pure(i: u8) -> u8 {
    | ^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn pure(i: u8) -> u8`
    |
    = note: `-D clippy::must-use-candidate` implied by `-D warnings`
 
 error: this method could have a `#[must_use]` attribute
-  --> $DIR/must_use_candidates.rs:17:5
+  --> $DIR/must_use_candidates.rs:16:5
    |
 LL |     pub fn inherent_pure(&self) -> u8 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn inherent_pure(&self) -> u8`
 
 error: this function could have a `#[must_use]` attribute
-  --> $DIR/must_use_candidates.rs:48:1
+  --> $DIR/must_use_candidates.rs:47:1
    |
 LL | pub fn with_marker(_d: std::marker::PhantomData<&mut u32>) -> bool {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn with_marker(_d: std::marker::PhantomData<&mut u32>) -> bool`
 
 error: this function could have a `#[must_use]` attribute
-  --> $DIR/must_use_candidates.rs:60:1
+  --> $DIR/must_use_candidates.rs:59:1
    |
 LL | pub fn rcd(_x: Rc<u32>) -> bool {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn rcd(_x: Rc<u32>) -> bool`
 
 error: this function could have a `#[must_use]` attribute
-  --> $DIR/must_use_candidates.rs:68:1
+  --> $DIR/must_use_candidates.rs:67:1
    |
 LL | pub fn arcd(_x: Arc<u32>) -> bool {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn arcd(_x: Arc<u32>) -> bool`
diff --git a/tests/ui/result_map_unit_fn_fixable.fixed b/tests/ui/result_map_unit_fn_fixable.fixed
@@ -1,6 +1,5 @@
 // run-rustfix
 
-#![feature(never_type)]
 #![warn(clippy::result_map_unit_fn)]
 #![allow(unused)]
 
diff --git a/tests/ui/result_map_unit_fn_fixable.rs b/tests/ui/result_map_unit_fn_fixable.rs
@@ -1,6 +1,5 @@
 // run-rustfix
 
-#![feature(never_type)]
 #![warn(clippy::result_map_unit_fn)]
 #![allow(unused)]
 
diff --git a/tests/ui/result_map_unit_fn_fixable.stderr b/tests/ui/result_map_unit_fn_fixable.stderr
@@ -1,5 +1,5 @@
 error: called `map(f)` on an Result value where `f` is a unit function
-  --> $DIR/result_map_unit_fn_fixable.rs:36:5
+  --> $DIR/result_map_unit_fn_fixable.rs:35:5
    |
 LL |     x.field.map(do_nothing);
    |     ^^^^^^^^^^^^^^^^^^^^^^^-
@@ -9,127 +9,127 @@ LL |     x.field.map(do_nothing);
    = note: `-D clippy::result-map-unit-fn` implied by `-D warnings`
 
 error: called `map(f)` on an Result value where `f` is a unit function
-  --> $DIR/result_map_unit_fn_fixable.rs:38:5
+  --> $DIR/result_map_unit_fn_fixable.rs:37:5
    |
 LL |     x.field.map(do_nothing);
    |     ^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(x_field) = x.field { do_nothing(x_field) }`
 
 error: called `map(f)` on an Result value where `f` is a unit function
-  --> $DIR/result_map_unit_fn_fixable.rs:40:5
+  --> $DIR/result_map_unit_fn_fixable.rs:39:5
    |
 LL |     x.field.map(diverge);
    |     ^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(x_field) = x.field { diverge(x_field) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:46:5
+  --> $DIR/result_map_unit_fn_fixable.rs:45:5
    |
 LL |     x.field.map(|value| x.do_result_nothing(value + captured));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { x.do_result_nothing(value + captured) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:48:5
+  --> $DIR/result_map_unit_fn_fixable.rs:47:5
    |
 LL |     x.field.map(|value| { x.do_result_plus_one(value + captured); });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { x.do_result_plus_one(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:51:5
+  --> $DIR/result_map_unit_fn_fixable.rs:50:5
    |
 LL |     x.field.map(|value| do_nothing(value + captured));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { do_nothing(value + captured) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:53:5
+  --> $DIR/result_map_unit_fn_fixable.rs:52:5
    |
 LL |     x.field.map(|value| { do_nothing(value + captured) });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { do_nothing(value + captured) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:55:5
+  --> $DIR/result_map_unit_fn_fixable.rs:54:5
    |
 LL |     x.field.map(|value| { do_nothing(value + captured); });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { do_nothing(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:57:5
+  --> $DIR/result_map_unit_fn_fixable.rs:56:5
    |
 LL |     x.field.map(|value| { { do_nothing(value + captured); } });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { do_nothing(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:60:5
+  --> $DIR/result_map_unit_fn_fixable.rs:59:5
    |
 LL |     x.field.map(|value| diverge(value + captured));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { diverge(value + captured) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:62:5
+  --> $DIR/result_map_unit_fn_fixable.rs:61:5
    |
 LL |     x.field.map(|value| { diverge(value + captured) });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { diverge(value + captured) }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:64:5
+  --> $DIR/result_map_unit_fn_fixable.rs:63:5
    |
 LL |     x.field.map(|value| { diverge(value + captured); });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { diverge(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:66:5
+  --> $DIR/result_map_unit_fn_fixable.rs:65:5
    |
 LL |     x.field.map(|value| { { diverge(value + captured); } });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { diverge(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:71:5
+  --> $DIR/result_map_unit_fn_fixable.rs:70:5
    |
 LL |     x.field.map(|value| { let y = plus_one(value + captured); });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { let y = plus_one(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:73:5
+  --> $DIR/result_map_unit_fn_fixable.rs:72:5
    |
 LL |     x.field.map(|value| { plus_one(value + captured); });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { plus_one(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:75:5
+  --> $DIR/result_map_unit_fn_fixable.rs:74:5
    |
 LL |     x.field.map(|value| { { plus_one(value + captured); } });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |     |
    |     help: try this: `if let Ok(value) = x.field { plus_one(value + captured); }`
 
 error: called `map(f)` on an Result value where `f` is a unit closure
-  --> $DIR/result_map_unit_fn_fixable.rs:78:5
+  --> $DIR/result_map_unit_fn_fixable.rs:77:5
    |
 LL |     x.field.map(|ref value| { do_nothing(value + captured) });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
diff --git a/tests/ui/result_map_unit_fn_unfixable.rs b/tests/ui/result_map_unit_fn_unfixable.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
 #![warn(clippy::result_map_unit_fn)]
 #![allow(unused)]
 
diff --git a/tests/ui/result_map_unit_fn_unfixable.stderr b/tests/ui/result_map_unit_fn_unfixable.stderr
@@ -1,23 +1,23 @@
 error[E0425]: cannot find value `x` in this scope
-  --> $DIR/result_map_unit_fn_unfixable.rs:17:5
+  --> $DIR/result_map_unit_fn_unfixable.rs:16:5
    |
 LL |     x.field.map(|value| { do_nothing(value); do_nothing(value) });
    |     ^ not found in this scope
 
 error[E0425]: cannot find value `x` in this scope
-  --> $DIR/result_map_unit_fn_unfixable.rs:19:5
+  --> $DIR/result_map_unit_fn_unfixable.rs:18:5
    |
 LL |     x.field.map(|value| if value > 0 { do_nothing(value); do_nothing(value) });
    |     ^ not found in this scope
 
 error[E0425]: cannot find value `x` in this scope
-  --> $DIR/result_map_unit_fn_unfixable.rs:23:5
+  --> $DIR/result_map_unit_fn_unfixable.rs:22:5
    |
 LL |     x.field.map(|value| {
    |     ^ not found in this scope
 
 error[E0425]: cannot find value `x` in this scope
-  --> $DIR/result_map_unit_fn_unfixable.rs:27:5
+  --> $DIR/result_map_unit_fn_unfixable.rs:26:5
    |
 LL |     x.field.map(|value| { do_nothing(value); do_nothing(value); });
    |     ^ not found in this scope

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![feature(never_type)]`
`2`	`1`	`#![warn(clippy::diverging_sub_expression)]`
`3`	`2`	`#![allow(clippy::match_same_arms, clippy::logic_bug)]`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,37 +1,37 @@`
`1`	`1`	`error: sub-expression diverges`
`2`		`- --> $DIR/diverging_sub_expression.rs:21:10`
	`2`	`+ --> $DIR/diverging_sub_expression.rs:20:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| b \|\| diverge();`
`5`	`5`	`\| ^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::diverging-sub-expression` implied by `-D warnings`
`8`	`8`
`9`	`9`	`error: sub-expression diverges`
`10`		`- --> $DIR/diverging_sub_expression.rs:22:10`
	`10`	`+ --> $DIR/diverging_sub_expression.rs:21:10`
`11`	`11`	`\|`
`12`	`12`	`LL \| b \|\| A.foo();`
`13`	`13`	`\| ^^^^^^^`
`14`	`14`
`15`	`15`	`error: sub-expression diverges`
`16`		`- --> $DIR/diverging_sub_expression.rs:31:26`
	`16`	`+ --> $DIR/diverging_sub_expression.rs:30:26`
`17`	`17`	`\|`
`18`	`18`	`LL \| 6 => true \|\| return,`
`19`	`19`	`\| ^^^^^^`
`20`	`20`
`21`	`21`	`error: sub-expression diverges`
`22`		`- --> $DIR/diverging_sub_expression.rs:32:26`
	`22`	`+ --> $DIR/diverging_sub_expression.rs:31:26`
`23`	`23`	`\|`
`24`	`24`	`LL \| 7 => true \|\| continue,`
`25`	`25`	`\| ^^^^^^^^`
`26`	`26`
`27`	`27`	`error: sub-expression diverges`
`28`		`- --> $DIR/diverging_sub_expression.rs:35:26`
	`28`	`+ --> $DIR/diverging_sub_expression.rs:34:26`
`29`	`29`	`\|`
`30`	`30`	`LL \| 3 => true \|\| diverge(),`
`31`	`31`	`\| ^^^^^^^^^`
`32`	`32`
`33`	`33`	`error: sub-expression diverges`
`34`		`- --> $DIR/diverging_sub_expression.rs:40:26`
	`34`	`+ --> $DIR/diverging_sub_expression.rs:39:26`
`35`	`35`	`\|`
`36`	`36`	`LL \| _ => true \|\| break,`
`37`	`37`	`\| ^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// run-rustfix`
`2`		`-#![feature(never_type)]`
`3`	`2`	`#![allow(unused_mut)]`
`4`	`3`	`#![warn(clippy::must_use_candidate)]`
`5`	`4`	`use std::rc::Rc;`
Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,31 @@`
`1`	`1`	error: this function could have a `#[must_use]` attribute
`2`		`- --> $DIR/must_use_candidates.rs:12:1`
	`2`	`+ --> $DIR/must_use_candidates.rs:11:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub fn pure(i: u8) -> u8 {`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn pure(i: u8) -> u8`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::must-use-candidate` implied by `-D warnings`
`8`	`8`
`9`	`9`	error: this method could have a `#[must_use]` attribute
`10`		`- --> $DIR/must_use_candidates.rs:17:5`
	`10`	`+ --> $DIR/must_use_candidates.rs:16:5`
`11`	`11`	`\|`
`12`	`12`	`LL \| pub fn inherent_pure(&self) -> u8 {`
`13`	`13`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn inherent_pure(&self) -> u8`
`14`	`14`
`15`	`15`	error: this function could have a `#[must_use]` attribute
`16`		`- --> $DIR/must_use_candidates.rs:48:1`
	`16`	`+ --> $DIR/must_use_candidates.rs:47:1`
`17`	`17`	`\|`
`18`	`18`	`LL \| pub fn with_marker(_d: std::marker::PhantomData<&mut u32>) -> bool {`
`19`	`19`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn with_marker(_d: std::marker::PhantomData<&mut u32>) -> bool`
`20`	`20`
`21`	`21`	error: this function could have a `#[must_use]` attribute
`22`		`- --> $DIR/must_use_candidates.rs:60:1`
	`22`	`+ --> $DIR/must_use_candidates.rs:59:1`
`23`	`23`	`\|`
`24`	`24`	`LL \| pub fn rcd(_x: Rc<u32>) -> bool {`
`25`	`25`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn rcd(_x: Rc<u32>) -> bool`
`26`	`26`
`27`	`27`	error: this function could have a `#[must_use]` attribute
`28`		`- --> $DIR/must_use_candidates.rs:68:1`
	`28`	`+ --> $DIR/must_use_candidates.rs:67:1`
`29`	`29`	`\|`
`30`	`30`	`LL \| pub fn arcd(_x: Arc<u32>) -> bool {`
`31`	`31`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add the attribute: `#[must_use] pub fn arcd(_x: Arc<u32>) -> bool`