Skip to content

Commit 51592f8

Browse files
flip1995flip1995
committed
Fix sync fallout
1 parent 018440c commit 51592f8

File tree

7 files changed

+27
-54
lines changed

7 files changed

+27
-54
lines changed

‎clippy_lints/src/escape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_middle::ty::{self, Ty};
66
use rustc_session::{declare_tool_lint, impl_lint_pass};
77
use rustc_span::source_map::Span;
88
use rustc_target::abi::LayoutOf;
9-
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceWithHirId, PlaceBase};
9+
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceBase, PlaceWithHirId};
1010

1111
use crate::utils::span_lint;
1212

‎clippy_lints/src/len_zero.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ fn check_impl_items(cx: &LateContext<'_, '_>, item: &Item<'_>, impl_items: &[Imp
211211
}
212212

213213
fn check_cmp(cx: &LateContext<'_, '_>, span: Span, method: &Expr<'_>, lit: &Expr<'_>, op: &str, compare_to: u32) {
214-
if let (&ExprKind::MethodCall(ref method_path, _, ref args, _), &ExprKind::Lit(ref lit)) = (&method.kind, &lit.kind) {
214+
if let (&ExprKind::MethodCall(ref method_path, _, ref args, _), &ExprKind::Lit(ref lit)) = (&method.kind, &lit.kind)
215+
{
215216
// check if we are in an is_empty() method
216217
if let Some(name) = get_item_name(cx, method) {
217218
if name.as_str() == "is_empty" {

‎clippy_lints/src/loops.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use rustc_middle::ty::{self, Ty, TyS};
2828
use rustc_session::{declare_lint_pass, declare_tool_lint};
2929
use rustc_span::source_map::Span;
3030
use rustc_span::symbol::Symbol;
31-
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceWithHirId, PlaceBase};
31+
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceBase, PlaceWithHirId};
3232
use std::iter::{once, Iterator};
3333
use std::mem;
3434

@@ -1580,13 +1580,13 @@ fn check_for_mutability(cx: &LateContext<'_, '_>, bound: &Expr<'_>) -> Option<Hi
15801580
None
15811581
}
15821582

1583-
fn check_for_mutation<'a, 'tcx> (
1583+
fn check_for_mutation<'a, 'tcx>(
15841584
cx: &LateContext<'a, 'tcx>,
15851585
body: &Expr<'_>,
15861586
bound_ids: &[Option<HirId>],
15871587
) -> (Option<Span>, Option<Span>) {
15881588
let mut delegate = MutatePairDelegate {
1589-
cx: cx,
1589+
cx,
15901590
hir_id_low: bound_ids[0],
15911591
hir_id_high: bound_ids[1],
15921592
span_low: None,

‎clippy_lints/src/types.rs‎

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,16 +1945,12 @@ fn detect_extreme_expr<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_
19451945

19461946
let which = match (&ty.kind, cv) {
19471947
(&ty::Bool, Constant::Bool(false)) | (&ty::Uint(_), Constant::Int(0)) => Minimum,
1948-
(&ty::Int(ity), Constant::Int(i))
1949-
if i == unsext(cx.tcx, i128::MIN >> (128 - int_bits(cx.tcx, ity)), ity) =>
1950-
{
1948+
(&ty::Int(ity), Constant::Int(i)) if i == unsext(cx.tcx, i128::MIN >> (128 - int_bits(cx.tcx, ity)), ity) => {
19511949
Minimum
19521950
},
19531951

19541952
(&ty::Bool, Constant::Bool(true)) => Maximum,
1955-
(&ty::Int(ity), Constant::Int(i))
1956-
if i == unsext(cx.tcx, i128::MAX >> (128 - int_bits(cx.tcx, ity)), ity) =>
1957-
{
1953+
(&ty::Int(ity), Constant::Int(i)) if i == unsext(cx.tcx, i128::MAX >> (128 - int_bits(cx.tcx, ity)), ity) => {
19581954
Maximum
19591955
},
19601956
(&ty::Uint(uty), Constant::Int(i)) if clip(cx.tcx, u128::MAX, uty) == i => Maximum,
@@ -2083,50 +2079,20 @@ fn numeric_cast_precast_bounds<'a>(cx: &LateContext<'_, '_>, expr: &'a Expr<'_>)
20832079
}
20842080
match pre_cast_ty.kind {
20852081
ty::Int(int_ty) => Some(match int_ty {
2086-
IntTy::I8 => (
2087-
FullInt::S(i128::from(i8::MIN)),
2088-
FullInt::S(i128::from(i8::MAX)),
2089-
),
2090-
IntTy::I16 => (
2091-
FullInt::S(i128::from(i16::MIN)),
2092-
FullInt::S(i128::from(i16::MAX)),
2093-
),
2094-
IntTy::I32 => (
2095-
FullInt::S(i128::from(i32::MIN)),
2096-
FullInt::S(i128::from(i32::MAX)),
2097-
),
2098-
IntTy::I64 => (
2099-
FullInt::S(i128::from(i64::MIN)),
2100-
FullInt::S(i128::from(i64::MAX)),
2101-
),
2082+
IntTy::I8 => (FullInt::S(i128::from(i8::MIN)), FullInt::S(i128::from(i8::MAX))),
2083+
IntTy::I16 => (FullInt::S(i128::from(i16::MIN)), FullInt::S(i128::from(i16::MAX))),
2084+
IntTy::I32 => (FullInt::S(i128::from(i32::MIN)), FullInt::S(i128::from(i32::MAX))),
2085+
IntTy::I64 => (FullInt::S(i128::from(i64::MIN)), FullInt::S(i128::from(i64::MAX))),
21022086
IntTy::I128 => (FullInt::S(i128::MIN), FullInt::S(i128::MAX)),
2103-
IntTy::Isize => (
2104-
FullInt::S(isize::MIN as i128),
2105-
FullInt::S(isize::MAX as i128),
2106-
),
2087+
IntTy::Isize => (FullInt::S(isize::MIN as i128), FullInt::S(isize::MAX as i128)),
21072088
}),
21082089
ty::Uint(uint_ty) => Some(match uint_ty {
2109-
UintTy::U8 => (
2110-
FullInt::U(u128::from(u8::MIN)),
2111-
FullInt::U(u128::from(u8::MAX)),
2112-
),
2113-
UintTy::U16 => (
2114-
FullInt::U(u128::from(u16::MIN)),
2115-
FullInt::U(u128::from(u16::MAX)),
2116-
),
2117-
UintTy::U32 => (
2118-
FullInt::U(u128::from(u32::MIN)),
2119-
FullInt::U(u128::from(u32::MAX)),
2120-
),
2121-
UintTy::U64 => (
2122-
FullInt::U(u128::from(u64::MIN)),
2123-
FullInt::U(u128::from(u64::MAX)),
2124-
),
2090+
UintTy::U8 => (FullInt::U(u128::from(u8::MIN)), FullInt::U(u128::from(u8::MAX))),
2091+
UintTy::U16 => (FullInt::U(u128::from(u16::MIN)), FullInt::U(u128::from(u16::MAX))),
2092+
UintTy::U32 => (FullInt::U(u128::from(u32::MIN)), FullInt::U(u128::from(u32::MAX))),
2093+
UintTy::U64 => (FullInt::U(u128::from(u64::MIN)), FullInt::U(u128::from(u64::MAX))),
21252094
UintTy::U128 => (FullInt::U(u128::MIN), FullInt::U(u128::MAX)),
2126-
UintTy::Usize => (
2127-
FullInt::U(usize::MIN as u128),
2128-
FullInt::U(usize::MAX as u128),
2129-
),
2095+
UintTy::Usize => (FullInt::U(usize::MIN as u128), FullInt::U(usize::MAX as u128)),
21302096
}),
21312097
_ => None,
21322098
}

‎clippy_lints/src/unnecessary_sort_by.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ fn mirrored_exprs(
9595
// The two exprs are method calls.
9696
// Check to see that the function is the same and the arguments are mirrored
9797
// This is enough because the receiver of the method is listed in the arguments
98-
(ExprKind::MethodCall(left_segment, _, left_args, _), ExprKind::MethodCall(right_segment, _, right_args, _)) => {
98+
(
99+
ExprKind::MethodCall(left_segment, _, left_args, _),
100+
ExprKind::MethodCall(right_segment, _, right_args, _),
101+
) => {
99102
left_segment.ident == right_segment.ident
100103
&& left_args
101104
.iter()

‎clippy_lints/src/utils/author.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,10 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor {
251251
}
252252
},
253253
ExprKind::MethodCall(ref _method_name, ref _generics, ref _args, ref _fn_span) => {
254-
println!("MethodCall(ref method_name, ref generics, ref args, ref fn_span) = {};", current);
254+
println!(
255+
"MethodCall(ref method_name, ref generics, ref args, ref fn_span) = {};",
256+
current
257+
);
255258
println!(" // unimplemented: `ExprKind::MethodCall` is not further destructured at the moment");
256259
},
257260
ExprKind::Tup(ref elements) => {

‎clippy_lints/src/utils/usage.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_lint::LateContext;
88
use rustc_middle::hir::map::Map;
99
use rustc_middle::ty;
1010
use rustc_span::symbol::{Ident, Symbol};
11-
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceWithHirId, PlaceBase};
11+
use rustc_typeck::expr_use_visitor::{ConsumeMode, Delegate, ExprUseVisitor, PlaceBase, PlaceWithHirId};
1212

1313
/// Returns a set of mutated local variable IDs, or `None` if mutations could not be determined.
1414
pub fn mutated_variables<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &'a LateContext<'a, 'tcx>) -> Option<FxHashSet<HirId>> {

0 commit comments

Comments
 (0)