Auto merge of #5116 - matthiaskrgr:rustup_29, r=flip1995

bors · bors · commit f3e2ccd54e78 · 2020-01-31T20:35:22.000Z
update test stderr

changelog: none
diff --git a/tests/ui/borrow_box.stderr b/tests/ui/borrow_box.stderr
@@ -4,7 +4,7 @@ error: you seem to be trying to use `&Box<T>`. Consider using just `&T`
 LL | pub fn test1(foo: &mut Box<bool>) {
    |                   ^^^^^^^^^^^^^^ help: try: `&mut bool`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/borrow_box.rs:1:9
    |
 LL | #![deny(clippy::borrowed_box)]
diff --git a/tests/ui/bytecount.stderr b/tests/ui/bytecount.stderr
@@ -4,7 +4,7 @@ error: You appear to be counting bytes the naive way
 LL |     let _ = x.iter().filter(|&&a| a == 0).count(); // naive byte count
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider using the bytecount crate: `bytecount::count(x, 0)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/bytecount.rs:1:8
    |
 LL | #[deny(clippy::naive_bytecount)]
diff --git a/tests/ui/checked_unwrap/complex_conditionals.stderr b/tests/ui/checked_unwrap/complex_conditionals.stderr
@@ -6,7 +6,7 @@ LL |     if x.is_ok() && y.is_err() {
 LL |         x.unwrap(); // unnecessary
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/complex_conditionals.rs:1:35
    |
 LL | #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]
@@ -21,7 +21,7 @@ LL |         x.unwrap(); // unnecessary
 LL |         x.unwrap_err(); // will panic
    |         ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/complex_conditionals.rs:1:9
    |
 LL | #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]
diff --git a/tests/ui/checked_unwrap/simple_conditionals.stderr b/tests/ui/checked_unwrap/simple_conditionals.stderr
@@ -6,7 +6,7 @@ LL |     if x.is_some() {
 LL |         x.unwrap(); // unnecessary
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/simple_conditionals.rs:1:35
    |
 LL | #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]
@@ -21,7 +21,7 @@ LL |     if x.is_some() {
 LL |         x.unwrap(); // will panic
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/simple_conditionals.rs:1:9
    |
 LL | #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]
diff --git a/tests/ui/cstring.stderr b/tests/ui/cstring.stderr
@@ -4,7 +4,7 @@ error: you are getting the inner pointer of a temporary `CString`
 LL |     CString::new("foo").unwrap().as_ptr();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cstring.rs:1:9
    |
 LL | #![deny(clippy::temporary_cstring_as_ptr)]
diff --git a/tests/ui/default_lint.stderr b/tests/ui/default_lint.stderr
@@ -9,7 +9,7 @@ LL | |     report_in_external_macro: true
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/default_lint.rs:1:9
    |
 LL | #![deny(clippy::internal)]
diff --git a/tests/ui/fallible_impl_from.stderr b/tests/ui/fallible_impl_from.stderr
@@ -8,7 +8,7 @@ LL | |     }
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/fallible_impl_from.rs:1:9
    |
 LL | #![deny(clippy::fallible_impl_from)]
diff --git a/tests/ui/get_unwrap.stderr b/tests/ui/get_unwrap.stderr
@@ -4,7 +4,7 @@ error: called `.get().unwrap()` on a slice. Using `[]` is more clear and more co
 LL |         let _ = boxed_slice.get(1).unwrap();
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&boxed_slice[1]`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/get_unwrap.rs:3:9
    |
 LL | #![deny(clippy::get_unwrap)]
diff --git a/tests/ui/identity_conversion.stderr b/tests/ui/identity_conversion.stderr
@@ -4,7 +4,7 @@ error: identical conversion
 LL |     let _ = T::from(val);
    |             ^^^^^^^^^^^^ help: consider removing `T::from()`: `val`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/identity_conversion.rs:3:9
    |
 LL | #![deny(clippy::identity_conversion)]
diff --git a/tests/ui/inefficient_to_string.stderr b/tests/ui/inefficient_to_string.stderr
@@ -4,7 +4,7 @@ error: calling `to_string` on `&&str`
 LL |     let _: String = rrstr.to_string();
    |                     ^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(*rrstr).to_string()`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/inefficient_to_string.rs:2:9
    |
 LL | #![deny(clippy::inefficient_to_string)]
diff --git a/tests/ui/infinite_iter.stderr b/tests/ui/infinite_iter.stderr
@@ -4,7 +4,7 @@ error: infinite iteration detected
 LL |     repeat(0_u8).collect::<Vec<_>>(); // infinite iter
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/infinite_iter.rs:8:8
    |
 LL | #[deny(clippy::infinite_iter)]
@@ -50,7 +50,7 @@ error: possible infinite iteration detected
 LL |     (0..).zip((0..).take_while(square_is_lower_64)).count(); // maybe infinite iter
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/infinite_iter.rs:29:8
    |
 LL | #[deny(clippy::maybe_infinite_iter)]
diff --git a/tests/ui/inherent_to_string.stderr b/tests/ui/inherent_to_string.stderr
@@ -17,7 +17,7 @@ LL | |         "C.to_string()".to_string()
 LL | |     }
    | |_____^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/inherent_to_string.rs:2:9
    |
 LL | #![deny(clippy::inherent_to_string_shadow_display)]
diff --git a/tests/ui/issue_2356.stderr b/tests/ui/issue_2356.stderr
@@ -4,7 +4,7 @@ error: this loop could be written as a `for` loop
 LL |         while let Some(e) = it.next() {
    |                             ^^^^^^^^^ help: try: `for e in it { .. }`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue_2356.rs:1:9
    |
 LL | #![deny(clippy::while_let_on_iterator)]
diff --git a/tests/ui/lint_without_lint_pass.stderr b/tests/ui/lint_without_lint_pass.stderr
@@ -9,7 +9,7 @@ LL | |     report_in_external_macro: true
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint_without_lint_pass.rs:1:9
    |
 LL | #![deny(clippy::internal)]
diff --git a/tests/ui/mem_discriminant.stderr b/tests/ui/mem_discriminant.stderr
@@ -6,7 +6,7 @@ LL |     mem::discriminant(&&Some(2));
    |                       |
    |                       help: try dereferencing: `&Some(2)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/mem_discriminant.rs:3:9
    |
 LL | #![deny(clippy::mem_discriminant_non_enum)]
diff --git a/tests/ui/mem_discriminant_unfixable.stderr b/tests/ui/mem_discriminant_unfixable.stderr
@@ -4,7 +4,7 @@ error: calling `mem::discriminant` on non-enum type `&str`
 LL |     mem::discriminant(&"hello");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/mem_discriminant_unfixable.rs:1:9
    |
 LL | #![deny(clippy::mem_discriminant_non_enum)]
diff --git a/tests/ui/option_and_then_some.stderr b/tests/ui/option_and_then_some.stderr
@@ -4,7 +4,7 @@ error: using `Option.and_then(Some)`, which is a no-op
 LL |     let _ = x.and_then(Some);
    |             ^^^^^^^^^^^^^^^^ help: use the expression directly: `x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/option_and_then_some.rs:2:9
    |
 LL | #![deny(clippy::option_and_then_some)]
diff --git a/tests/ui/outer_expn_data.stderr b/tests/ui/outer_expn_data.stderr
@@ -4,7 +4,7 @@ error: usage of `outer_expn().expn_data()`
 LL |         let _ = expr.span.ctxt().outer_expn().expn_data();
    |                                  ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `outer_expn_data()`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/outer_expn_data.rs:3:9
    |
 LL | #![deny(clippy::internal)]
diff --git a/tests/ui/replace_consts.stderr b/tests/ui/replace_consts.stderr
@@ -4,7 +4,7 @@ error: using `MIN`
 LL |     { let foo = std::isize::MIN; };
    |                 ^^^^^^^^^^^^^^^ help: try this: `isize::min_value()`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/replace_consts.rs:4:9
    |
 LL | #![deny(clippy::replace_consts)]
diff --git a/tests/ui/try_err.stderr b/tests/ui/try_err.stderr
@@ -4,7 +4,7 @@ error: returning an `Err(_)` with the `?` operator
 LL |         Err(err)?;
    |         ^^^^^^^^^ help: try this: `return Err(err)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/try_err.rs:4:9
    |
 LL | #![deny(clippy::try_err)]
diff --git a/tests/ui/type_repetition_in_bounds.stderr b/tests/ui/type_repetition_in_bounds.stderr
@@ -4,7 +4,7 @@ error: this type has already been used as a bound predicate
 LL |     T: Clone,
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/type_repetition_in_bounds.rs:1:8
    |
 LL | #[deny(clippy::type_repetition_in_bounds)]
diff --git a/tests/ui/unnecessary_ref.stderr b/tests/ui/unnecessary_ref.stderr
@@ -4,7 +4,7 @@ error: Creating a reference that is immediately dereferenced.
 LL |     let inner = (&outer).inner;
    |                 ^^^^^^^^ help: try this: `outer`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unnecessary_ref.rs:10:8
    |
 LL | #[deny(clippy::ref_in_deref)]
diff --git a/tests/ui/unneeded_wildcard_pattern.stderr b/tests/ui/unneeded_wildcard_pattern.stderr
@@ -4,7 +4,7 @@ error: this pattern is unneeded as the `..` pattern can match that element
 LL |     if let (0, .., _) = t {};
    |                  ^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unneeded_wildcard_pattern.rs:3:9
    |
 LL | #![deny(clippy::unneeded_wildcard_pattern)]
diff --git a/tests/ui/unused_unit.stderr b/tests/ui/unused_unit.stderr
@@ -6,7 +6,7 @@ LL |       pub fn get_unit<F: Fn() -> (), G>(&self, f: F, _g: G) ->
 LL | |         ()
    | |__________^ help: remove the `-> ()`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused_unit.rs:12:9
    |
 LL | #![deny(clippy::unused_unit)]
diff --git a/tests/ui/useless_asref.stderr b/tests/ui/useless_asref.stderr
@@ -4,7 +4,7 @@ error: this call to `as_ref` does nothing
 LL |         foo_rstr(rstr.as_ref());
    |                  ^^^^^^^^^^^^^ help: try this: `rstr`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/useless_asref.rs:3:9
    |
 LL | #![deny(clippy::useless_asref)]
diff --git a/tests/ui/wildcard_enum_match_arm.stderr b/tests/ui/wildcard_enum_match_arm.stderr
@@ -4,7 +4,7 @@ error: wildcard match will miss any future added variants
 LL |         _ => eprintln!("Not red"),
    |         ^ help: try this: `Color::Green | Color::Blue | Color::Rgb(..) | Color::Cyan`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/wildcard_enum_match_arm.rs:3:9
    |
 LL | #![deny(clippy::wildcard_enum_match_arm)]

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: you seem to be trying to use `&Box<T>`. Consider using just `&T`
`4`	`4`	`LL \| pub fn test1(foo: &mut Box<bool>) {`
`5`	`5`	\| ^^^^^^^^^^^^^^ help: try: `&mut bool`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/borrow_box.rs:1:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::borrowed_box)]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: You appear to be counting bytes the naive way`
`4`	`4`	`LL \| let _ = x.iter().filter(\|&&a\| a == 0).count(); // naive byte count`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider using the bytecount crate: `bytecount::count(x, 0)`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/bytecount.rs:1:8`
`9`	`9`	`\|`
`10`	`10`	`LL \| #[deny(clippy::naive_bytecount)]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| if x.is_ok() && y.is_err() {`
`6`	`6`	`LL \| x.unwrap(); // unnecessary`
`7`	`7`	`\| ^^^^^^^^^^`
`8`	`8`	`\|`
`9`		`-note: lint level defined here`
	`9`	`+note: the lint level is defined here`
`10`	`10`	`--> $DIR/complex_conditionals.rs:1:35`
`11`	`11`	`\|`
`12`	`12`	`LL \| #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]`
`@@ -21,7 +21,7 @@ LL \| x.unwrap(); // unnecessary`
`21`	`21`	`LL \| x.unwrap_err(); // will panic`
`22`	`22`	`\| ^^^^^^^^^^^^^^`
`23`	`23`	`\|`
`24`		`-note: lint level defined here`
	`24`	`+note: the lint level is defined here`
`25`	`25`	`--> $DIR/complex_conditionals.rs:1:9`
`26`	`26`	`\|`
`27`	`27`	`LL \| #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| if x.is_some() {`
`6`	`6`	`LL \| x.unwrap(); // unnecessary`
`7`	`7`	`\| ^^^^^^^^^^`
`8`	`8`	`\|`
`9`		`-note: lint level defined here`
	`9`	`+note: the lint level is defined here`
`10`	`10`	`--> $DIR/simple_conditionals.rs:1:35`
`11`	`11`	`\|`
`12`	`12`	`LL \| #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]`
`@@ -21,7 +21,7 @@ LL \| if x.is_some() {`
`21`	`21`	`LL \| x.unwrap(); // will panic`
`22`	`22`	`\| ^^^^^^^^^^`
`23`	`23`	`\|`
`24`		`-note: lint level defined here`
	`24`	`+note: the lint level is defined here`
`25`	`25`	`--> $DIR/simple_conditionals.rs:1:9`
`26`	`26`	`\|`
`27`	`27`	`LL \| #![deny(clippy::panicking_unwrap, clippy::unnecessary_unwrap)]`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: you are getting the inner pointer of a temporary `CString`
`4`	`4`	`LL \| CString::new("foo").unwrap().as_ptr();`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/cstring.rs:1:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::temporary_cstring_as_ptr)]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| \| report_in_external_macro: true`
`9`	`9`	`LL \| \| }`
`10`	`10`	`\| \|_^`
`11`	`11`	`\|`
`12`		`-note: lint level defined here`
	`12`	`+note: the lint level is defined here`
`13`	`13`	`--> $DIR/default_lint.rs:1:9`
`14`	`14`	`\|`
`15`	`15`	`LL \| #![deny(clippy::internal)]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ LL \| \| }`
`8`	`8`	`LL \| \| }`
`9`	`9`	`\| \|_^`
`10`	`10`	`\|`
`11`		`-note: lint level defined here`
	`11`	`+note: the lint level is defined here`
`12`	`12`	`--> $DIR/fallible_impl_from.rs:1:9`
`13`	`13`	`\|`
`14`	`14`	`LL \| #![deny(clippy::fallible_impl_from)]`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: called `.get().unwrap()` on a slice. Using `[]` is more clear and more co
`4`	`4`	`LL \| let _ = boxed_slice.get(1).unwrap();`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `&boxed_slice[1]`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/get_unwrap.rs:3:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::get_unwrap)]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: identical conversion`
`4`	`4`	`LL \| let _ = T::from(val);`
`5`	`5`	\| ^^^^^^^^^^^^ help: consider removing `T::from()`: `val`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/identity_conversion.rs:3:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::identity_conversion)]`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: calling `to_string` on `&&str`
`4`	`4`	`LL \| let _: String = rrstr.to_string();`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(*rrstr).to_string()`
`6`	`6`	`\|`
`7`		`-note: lint level defined here`
	`7`	`+note: the lint level is defined here`
`8`	`8`	`--> $DIR/inefficient_to_string.rs:2:9`
`9`	`9`	`\|`
`10`	`10`	`LL \| #![deny(clippy::inefficient_to_string)]`