Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-15 09:27:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

literal representation restructure 2

Browse source 
Consolidate warning handling using "poor man's try".
This commit is contained in:
Michael Wright 2019-11-13 08:27:05 +02:00
parent 8f5b4f3f5c
commit 2dbd34ffe8
1 changed files with 42 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
clippy_lints/src/literal_representation.rs
View file

@ -365,18 +365,18 @@ impl LiteralDigitGrouping {
if char::is_digit(firstch, 10);
then {
let digit_info = match lit.kind {
LitKind::Int(..) => DigitInfo::new(&src, false),
LitKind::Float(..) => DigitInfo::new(&src, true),
_ => return,
};
let result = (|| {
match lit.kind {
LitKind::Int(..) => {
// Lint integral literals.
let digit_info = DigitInfo::new(&src, false);
let _ = Self::do_lint(digit_info.digits, digit_info.suffix, in_macro).map_err(|warning_type| {
warning_type.display(&digit_info.grouping_hint(), cx, lit.span)
});
Self::do_lint(digit_info.digits, digit_info.suffix, in_macro)?;
},
LitKind::Float(..) => {
// Lint floating-point literals.
let digit_info = DigitInfo::new(&src, true);
// Separate digits into integral and fractional parts.
let parts: Vec<&str> = digit_info
.digits
@ -385,34 +385,30 @@ impl LiteralDigitGrouping {
// Lint integral and fractional parts separately, and then check consistency of digit
// groups if both pass.
let _ = Self::do_lint(parts[0], digit_info.suffix, in_macro)
.map(|integral_group_size| {
let integral_group_size = Self::do_lint(parts[0], digit_info.suffix, in_macro)?;
if parts.len() > 1 {
// Lint the fractional part of literal just like integral part, but reversed.
let fractional_part = &parts[1].chars().rev().collect::<String>();
let _ = Self::do_lint(fractional_part, None, in_macro)
.map(|fractional_group_size| {
let fractional_group_size = Self::do_lint(fractional_part, None, in_macro)?;
let consistent = Self::parts_consistent(integral_group_size,
fractional_group_size,
parts[0].len(),
parts[1].len());
if !consistent {
WarningType::InconsistentDigitGrouping.display(
&digit_info.grouping_hint(),
cx,
lit.span,
);
}
})
.map_err(|warning_type| warning_type.display(&digit_info.grouping_hint(),
cx,
lit.span));
}
})
.map_err(|warning_type| warning_type.display(&digit_info.grouping_hint(), cx, lit.span));
return Err(WarningType::InconsistentDigitGrouping);
};
};
},
_ => (),
}
Ok(())
})();
if let Err(warning_type) = result {
warning_type.display(&digit_info.grouping_hint(), cx, lit.span)
}
}
}
}