diff options
author | Nick Hackman <snickhackman@gmail.com> | 2019-08-14 22:52:24 -0400 |
---|---|---|
committer | Nick Hackman <snickhackman@gmail.com> | 2019-08-14 23:05:30 -0400 |
commit | 2bf0931b84064e79b7af0c37a5bb25c06fdedce0 (patch) | |
tree | 06a5d72c6482f6fd8fd6862d76be6bc8c8ca595d /src/tokens.rs | |
parent | 8f4372873ec3964b458fa40c906832936f9074a8 (diff) | |
download | milf-rs-2bf0931b84064e79b7af0c37a5bb25c06fdedce0.tar.gz milf-rs-2bf0931b84064e79b7af0c37a5bb25c06fdedce0.zip |
Removed all warnings besides two
Majority of warnings removed via RustFix
Two remain one being a long return type and another being a name
suggestion from Clippy `to_owned` for MaybeString
Diffstat (limited to 'src/tokens.rs')
-rw-r--r-- | src/tokens.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/tokens.rs b/src/tokens.rs index f9d3eb4..91824c5 100644 --- a/src/tokens.rs +++ b/src/tokens.rs @@ -84,7 +84,7 @@ enum MaybeString { impl<'a> Tokenizer<'a> { pub fn new(input: &'a str) -> Tokenizer<'a> { let mut t = Tokenizer { - input: input, + input, chars: CrlfFold { chars: input.char_indices(), }, @@ -266,7 +266,7 @@ impl<'a> Tokenizer<'a> { .clone() .next() .map(|i| i.0) - .unwrap_or(self.input.len()) + .unwrap_or_else(|| self.input.len()) } pub fn input(&self) -> &'a str { @@ -349,7 +349,7 @@ impl<'a> Tokenizer<'a> { return Ok(String { src: &self.input[start..self.current()], val: val.into_cow(&self.input[..i]), - multiline: multiline, + multiline, }); } Some((i, c)) => new_ch(self, &mut val, multiline, i, c)?, @@ -463,10 +463,7 @@ impl<'a> Tokenizer<'a> { .peek_one() .map(|t| t.0) .unwrap_or_else(|| self.input.len()); - Span { - start: start, - end: end, - } + Span { start, end } } /// Peek one char without consuming it. @@ -642,7 +639,7 @@ mod tests { err(r#""\U00""#, Error::InvalidHexEscape(5, '"')); err(r#""\U00"#, Error::UnterminatedString(0)); err(r#""\uD800"#, Error::InvalidEscapeValue(2, 0xd800)); - err(r#""\UFFFFFFFF"#, Error::InvalidEscapeValue(2, 0xffffffff)); + err(r#""\UFFFFFFFF"#, Error::InvalidEscapeValue(2, 0xffff_ffff)); } #[test] |