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

tmp progress

Browse source
This commit is contained in:
Maxwell Anderson 2018-10-11 22:15:01 -06:00
parent dd11ffac0b
commit 9fad38dca9
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clippy_lints/src/literal_representation.rs
View file

@ -173,8 +173,10 @@ impl<'a> DigitInfo<'a> {
} else { } else {
d_idx d_idx
}; };
if float && (d == 'f' || d == 'e' || d == 'E') || if float && ((is_possible_float_suffix_index(&sans_prefix, suffix_start, len)) ||
!float && (d == 'i' || d == 'u' || is_possible_suffix_index(&sans_prefix, suffix_start, len)) { (d == 'f' || d == 'e' || d == 'E')) ||
!float && (d == 'i' || d == 'u' ||
is_possible_suffix_index(&sans_prefix, suffix_start, len)) {
let (digits, suffix) = sans_prefix.split_at(suffix_start); let (digits, suffix) = sans_prefix.split_at(suffix_start);
return Self { return Self {
digits, digits,
@ -248,6 +250,9 @@ impl<'a> DigitInfo<'a> {
hint = format!("{:0>4}{}", &hint[..nb_digits_to_fill], &hint[nb_digits_to_fill..]); hint = format!("{:0>4}{}", &hint[..nb_digits_to_fill], &hint[nb_digits_to_fill..]);
} }
let suffix_hint = match self.suffix { let suffix_hint = match self.suffix {
Some(suffix) if is_mistyped_float_suffix(suffix) && self.digits.contains(".") => {
format!("_f{}", &suffix[1..])
},
Some(suffix) if is_mistyped_suffix(suffix) => { Some(suffix) if is_mistyped_suffix(suffix) => {
format!("_i{}", &suffix[1..]) format!("_i{}", &suffix[1..])
}, },
@ -572,3 +577,12 @@ fn is_possible_suffix_index(lit: &str, idx: usize, len: usize) -> bool {
((len > 3 && idx == len - 3) || (len > 2 && idx == len - 2)) && ((len > 3 && idx == len - 3) || (len > 2 && idx == len - 2)) &&
is_mistyped_suffix(lit.split_at(idx).1) is_mistyped_suffix(lit.split_at(idx).1)
} }
fn is_mistyped_float_suffix(suffix: &str) -> bool {
["_32", "_64"].contains(&suffix)
}
fn is_possible_float_suffix_index(lit: &str, idx: usize, len: usize) -> bool {
((len > 3 && idx == len - 3) || (len > 2 && idx == len - 2)) &&
is_mistyped_float_suffix(lit.split_at(idx).1)
}

3
tests/ui/literals.rs
View file

@ -64,4 +64,7 @@ fn main() {
let fail21 = 4___16; let fail21 = 4___16;
let fail22 = 3__4___23; let fail22 = 3__4___23;
let fail23 = 3__16___23; let fail23 = 3__16___23;
//let fail24 = 1E2_32;
let fail25 = 1.2_32;
} }