clippy fixes (#656)

This commit is contained in:
Ophir LOJKINE 2022-10-07 22:41:33 +02:00 committed by GitHub
parent e7fb3d4fa7
commit f2b0efec0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -229,7 +229,7 @@ impl Token {
Token::Word(Word { Token::Word(Word {
value: word.to_string(), value: word.to_string(),
quote_style, quote_style,
keyword: if quote_style == None { keyword: if quote_style.is_none() {
let keyword = ALL_KEYWORDS.binary_search(&word_uppercase.as_str()); let keyword = ALL_KEYWORDS.binary_search(&word_uppercase.as_str());
keyword.map_or(Keyword::NoKeyword, |x| ALL_KEYWORDS_INDEX[x]) keyword.map_or(Keyword::NoKeyword, |x| ALL_KEYWORDS_INDEX[x])
} else { } else {
@ -354,11 +354,11 @@ impl<'a> Tokenizer<'a> {
} }
Token::Whitespace(Whitespace::Tab) => self.col += 4, Token::Whitespace(Whitespace::Tab) => self.col += 4,
Token::Word(w) if w.quote_style == None => { Token::Word(w) => {
self.col += w.value.chars().count() as u64 self.col += w.value.chars().count() as u64;
} if w.quote_style.is_some() {
Token::Word(w) if w.quote_style != None => { self.col += 2
self.col += w.value.chars().count() as u64 + 2 }
} }
Token::Number(s, _) => self.col += s.chars().count() as u64, Token::Number(s, _) => self.col += s.chars().count() as u64,
Token::SingleQuotedString(s) => self.col += s.chars().count() as u64, Token::SingleQuotedString(s) => self.col += s.chars().count() as u64,