user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #6104 - mikerite:fix-6096, r=ebroto

Browse source 
Allow exponent separator

Fixes #6096

changelog: Fixed bug in `clippy::inconsistent_digit_grouping` when floating point exponent is used
This commit is contained in:
bors 2020-10-02 08:36:54 +00:00
commit f0eac45db4
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
clippy_lints/src/utils/numeric_literal.rs
View file

@ -36,8 +36,9 @@ pub struct NumericLiteral<'a> {
pub integer: &'a str,
/// The fraction part of the number.
pub fraction: Option<&'a str>,
/// The character used as exponent separator (b'e' or b'E') and the exponent part.
pub exponent: Option<(char, &'a str)>,
/// The exponent separator (b'e' or b'E') including preceding underscore if present
/// and the exponent part.
pub exponent: Option<(&'a str, &'a str)>,
/// The type suffix, including preceding underscore if present.
pub suffix: Option<&'a str>,
@ -100,7 +101,7 @@ impl<'a> NumericLiteral<'a> {
self.radix == Radix::Decimal
}
pub fn split_digit_parts(digits: &str, float: bool) -> (&str, Option<&str>, Option<(char, &str)>) {
pub fn split_digit_parts(digits: &str, float: bool) -> (&str, Option<&str>, Option<(&str, &str)>) {
let mut integer = digits;
let mut fraction = None;
let mut exponent = None;
@ -113,12 +114,14 @@ impl<'a> NumericLiteral<'a> {
fraction = Some(&digits[i + 1..]);
},
'e' | 'E' => {
if integer.len() > i {
integer = &digits[..i];
let exp_start = if digits[..i].ends_with('_') { i - 1 } else { i };
if integer.len() > exp_start {
integer = &digits[..exp_start];
} else {
fraction = Some(&digits[integer.len() + 1..i]);
fraction = Some(&digits[integer.len() + 1..exp_start]);
};
exponent = Some((c, &digits[i + 1..]));
exponent = Some((&digits[exp_start..=i], &digits[i + 1..]));
break;
},
_ => {},
@ -153,7 +156,7 @@ impl<'a> NumericLiteral<'a> {
}
if let Some((separator, exponent)) = self.exponent {
output.push(separator);
output.push_str(separator);
Self::group_digits(&mut output, exponent, group_size, true, false);
}

4
tests/ui/inconsistent_digit_grouping.fixed
View file

@ -40,4 +40,8 @@ fn main() {
// Ignore literals in macros
let _ = mac1!();
let _ = mac2!();
// Issue #6096
// Allow separating exponent with '_'
let _ = 1.025_011_10_E0;
}

4
tests/ui/inconsistent_digit_grouping.rs
View file

@ -40,4 +40,8 @@ fn main() {
// Ignore literals in macros
let _ = mac1!();
let _ = mac2!();
// Issue #6096
// Allow separating exponent with '_'
let _ = 1.025_011_10_E0;
}