Skip to content

Commit

Permalink
Auto merge of #4285 - matthiaskrgr:rustup_backticks, r=phansch
Browse files Browse the repository at this point in the history
rustup rust-lang/rust#62764

(was merged as part of rust-lang/rust#62782 )

changelog: none
  • Loading branch information
bors committed Jul 19, 2019
2 parents c467273 + deb586a commit e5f2330
Show file tree
Hide file tree
Showing 22 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion tests/ui/absurd-extreme-comparisons.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ error: <-comparison of unit values detected. This will always be false
LL | () < {};
| ^^^^^^^
|
= note: #[deny(clippy::unit_cmp)] on by default
= note: `#[deny(clippy::unit_cmp)]` on by default

error: aborting due to 18 previous errors

2 changes: 1 addition & 1 deletion tests/ui/bit_masks.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ error: this operation will always return zero. This is likely not the intended o
LL | x & 0 == 0;
| ^^^^^
|
= note: #[deny(clippy::erasing_op)] on by default
= note: `#[deny(clippy::erasing_op)]` on by default

error: incompatible bit mask: `_ & 2` can never be equal to `1`
--> $DIR/bit_masks.rs:17:5
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/cstring.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: you are getting the inner pointer of a temporary `CString`
LL | CString::new("foo").unwrap().as_ptr();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: #[deny(clippy::temporary_cstring_as_ptr)] on by default
= note: `#[deny(clippy::temporary_cstring_as_ptr)]` on by default
= note: that pointer will be invalid outside this expression
help: assign the `CString` to a variable to extend its lifetime
--> $DIR/cstring.rs:7:5
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/derive.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: you are deriving `Hash` but have implemented `PartialEq` explicitly
LL | #[derive(Hash)]
| ^^^^
|
= note: #[deny(clippy::derive_hash_xor_eq)] on by default
= note: `#[deny(clippy::derive_hash_xor_eq)]` on by default
note: `PartialEq` implemented here
--> $DIR/derive.rs:19:1
|
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/drop_bounds.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: Bounds of the form `T: Drop` are useless. Use `std::mem::needs_drop` to d
LL | fn foo<T: Drop>() {}
| ^^^^
|
= note: #[deny(clippy::drop_bounds)] on by default
= note: `#[deny(clippy::drop_bounds)]` on by default

error: Bounds of the form `T: Drop` are useless. Use `std::mem::needs_drop` to detect if a type has drop glue.
--> $DIR/drop_bounds.rs:5:8
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/for_loop_over_option_result.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ error: you are iterating over `Iterator::next()` which is an Option; this will c
LL | for x in v.iter().next() {
| ^^^^^^^^^^^^^^^
|
= note: #[deny(clippy::iter_next_loop)] on by default
= note: `#[deny(clippy::iter_next_loop)]` on by default

error: for loop over `v.iter().next().and(Some(0))`, which is an `Option`. This is more readably written as an `if let` statement.
--> $DIR/for_loop_over_option_result.rs:31:14
Expand All @@ -57,7 +57,7 @@ LL | | break;
LL | | }
| |_____^
|
= note: #[deny(clippy::never_loop)] on by default
= note: `#[deny(clippy::never_loop)]` on by default

error: this loop never actually loops
--> $DIR/for_loop_over_option_result.rs:53:5
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/if_same_then_else.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ error: this `if` has the same condition as a previous if
LL | } else if true {
| ^^^^
|
= note: #[deny(clippy::ifs_same_cond)] on by default
= note: `#[deny(clippy::ifs_same_cond)]` on by default
note: same as this
--> $DIR/if_same_then_else.rs:235:8
|
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/indexing_slicing.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: index out of bounds: the len is 4 but the index is 4
LL | x[4]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
| ^^^^
|
= note: #[deny(const_err)] on by default
= note: `#[deny(const_err)]` on by default

error: index out of bounds: the len is 4 but the index is 8
--> $DIR/indexing_slicing.rs:19:5
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/infinite_iter.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ error: infinite iteration detected
LL | let _: HashSet<i32> = (0..).collect(); // Infinite iter
| ^^^^^^^^^^^^^^^
|
= note: #[deny(clippy::infinite_iter)] on by default
= note: `#[deny(clippy::infinite_iter)]` on by default

error: aborting due to 15 previous errors

2 changes: 1 addition & 1 deletion tests/ui/infinite_loop.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: Variable in the condition are not mutated in the loop body. This either l
LL | while y < 10 {
| ^^^^^^
|
= note: #[deny(clippy::while_immutable_condition)] on by default
= note: `#[deny(clippy::while_immutable_condition)]` on by default

error: Variable in the condition are not mutated in the loop body. This either leads to an infinite or to a never running loop.
--> $DIR/infinite_loop.rs:28:11
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/invalid_ref.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: reference to zeroed memory
LL | let ref_zero: &T = std::mem::zeroed(); // warning
| ^^^^^^^^^^^^^^^^^^
|
= note: #[deny(clippy::invalid_ref)] on by default
= note: `#[deny(clippy::invalid_ref)]` on by default
= help: Creation of a null reference is undefined behavior; see https://doc.rust-lang.org/reference/behavior-considered-undefined.html

error: reference to zeroed memory
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/lint_without_lint_pass.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ note: lint level defined here
|
LL | #![deny(clippy::internal)]
| ^^^^^^^^^^^^^^^^
= note: #[deny(clippy::lint_without_lint_pass)] implied by #[deny(clippy::internal)]
= note: `#[deny(clippy::lint_without_lint_pass)]` implied by `#[deny(clippy::internal)]`
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

error: aborting due to previous error
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/match_bool.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ error: equal expressions as operands to `&&`
LL | match test && test {
| ^^^^^^^^^^^^
|
= note: #[deny(clippy::eq_op)] on by default
= note: `#[deny(clippy::eq_op)]` on by default

error: you seem to be trying to match on a boolean expression
--> $DIR/match_bool.rs:36:5
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/mistyped_literal_suffix.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: mistyped literal suffix
LL | let fail14 = 2_32;
| ^^^^ help: did you mean to write: `2_i32`
|
= note: #[deny(clippy::mistyped_literal_suffixes)] on by default
= note: `#[deny(clippy::mistyped_literal_suffixes)]` on by default

error: mistyped literal suffix
--> $DIR/mistyped_literal_suffix.rs:7:18
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/never_loop.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LL | | break;
LL | | }
| |_____^
|
= note: #[deny(clippy::never_loop)] on by default
= note: `#[deny(clippy::never_loop)]` on by default

error: this loop never actually loops
--> $DIR/never_loop.rs:32:5
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/non_copy_const.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LL | const ATOMIC: AtomicUsize = AtomicUsize::new(5); //~ ERROR interior mutable
| |
| help: make this a static item: `static`
|
= note: #[deny(clippy::declare_interior_mutable_const)] on by default
= note: `#[deny(clippy::declare_interior_mutable_const)]` on by default

error: a const item should never be interior mutable
--> $DIR/non_copy_const.rs:11:1
Expand Down Expand Up @@ -132,7 +132,7 @@ error: a const item with interior mutability should not be borrowed
LL | ATOMIC.store(1, Ordering::SeqCst); //~ ERROR interior mutability
| ^^^^^^
|
= note: #[deny(clippy::borrow_interior_mutable_const)] on by default
= note: `#[deny(clippy::borrow_interior_mutable_const)]` on by default
= help: assign this const to a local or static variable, and use the variable here

error: a const item with interior mutability should not be borrowed
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/out_of_bounds_indexing/empty_array.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: index out of bounds: the len is 0 but the index is 0
LL | empty[0];
| ^^^^^^^^
|
= note: #[deny(const_err)] on by default
= note: `#[deny(const_err)]` on by default

error: range is out of bounds
--> $DIR/empty_array.rs:7:12
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/outer_expn_info.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ note: lint level defined here
|
LL | #![deny(clippy::internal)]
| ^^^^^^^^^^^^^^^^
= note: #[deny(clippy::outer_expn_info)] implied by #[deny(clippy::internal)]
= note: `#[deny(clippy::outer_expn_info)]` implied by `#[deny(clippy::internal)]`

error: aborting due to previous error

2 changes: 1 addition & 1 deletion tests/ui/proc_macro.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: approximate value of `f{32, 64}::consts::PI` found. Consider using it dir
LL | let _x = 3.14;
| ^^^^
|
= note: #[deny(clippy::approx_constant)] on by default
= note: `#[deny(clippy::approx_constant)]` on by default

error: aborting due to previous error

2 changes: 1 addition & 1 deletion tests/ui/suspicious_arithmetic_impl.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ error: Suspicious use of binary operator in `AddAssign` impl
LL | *self = *self - other;
| ^
|
= note: #[deny(clippy::suspicious_op_assign_impl)] on by default
= note: `#[deny(clippy::suspicious_op_assign_impl)]` on by default

error: aborting due to 2 previous errors

2 changes: 1 addition & 1 deletion tests/ui/unnecessary_clone.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ error: using `clone` on a double-reference; this will copy the reference instead
LL | let z: &Vec<_> = y.clone();
| ^^^^^^^^^
|
= note: #[deny(clippy::clone_double_ref)] on by default
= note: `#[deny(clippy::clone_double_ref)]` on by default
help: try dereferencing it
|
LL | let z: &Vec<_> = &(*y).clone();
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/zero_div_zero.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: equal expressions as operands to `/`
LL | let nan = 0.0 / 0.0;
| ^^^^^^^^^
|
= note: #[deny(clippy::eq_op)] on by default
= note: `#[deny(clippy::eq_op)]` on by default

error: constant division of 0.0 with 0.0 will always result in NaN
--> $DIR/zero_div_zero.rs:4:15
Expand Down

0 comments on commit e5f2330

Please sign in to comment.