arcayr/saphyr-serde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy warnings about not

Browse source
This commit is contained in:
Yuheng Chen 2016-03-10 20:49:02 +08:00
parent 1d7a32c3c7
commit 5fa1c5d7cc
2 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
saphyr/src/scanner.rs
View file

@ -647,11 +647,11 @@ impl<T: Iterator<Item=char>> Scanner<T> {
self.lookahead(1); self.lookahead(1);
if !is_blankz(self.ch()) { if is_blankz(self.ch()) {
Ok(Token(*mark, TokenType::TagDirective(handle, prefix)))
} else {
Err(ScanError::new(*mark, Err(ScanError::new(*mark,
"while scanning TAG, did not find expected whitespace or line break")) "while scanning TAG, did not find expected whitespace or line break"))
} else {
Ok(Token(*mark, TokenType::TagDirective(handle, prefix)))
} }
} }
@ -1305,28 +1305,33 @@ impl<T: Iterator<Item=char>> Scanner<T> {
while is_blank(self.ch()) || is_break(self.ch()) { while is_blank(self.ch()) || is_break(self.ch()) {
if is_blank(self.ch()) { if is_blank(self.ch()) {
// Consume a space or a tab character. // Consume a space or a tab character.
if !leading_blanks { if leading_blanks {
whitespaces.push(self.ch());
self.skip(); self.skip();
} else { } else {
whitespaces.push(self.ch());
self.skip(); self.skip();
} }
} else { } else {
self.lookahead(2); self.lookahead(2);
// Check if it is a first line break. // Check if it is a first line break.
if !leading_blanks { if leading_blanks {
self.read_break(&mut trailing_breaks);
} else {
whitespaces.clear(); whitespaces.clear();
self.read_break(&mut leading_break); self.read_break(&mut leading_break);
leading_blanks = true; leading_blanks = true;
} else {
self.read_break(&mut trailing_breaks);
} }
} }
self.lookahead(1); self.lookahead(1);
} }
// Join the whitespaces or fold line breaks. // Join the whitespaces or fold line breaks.
if leading_blanks { if leading_blanks {
if !leading_break.is_empty() { if leading_break.is_empty() {
string.extend(leading_break.chars());
string.extend(trailing_breaks.chars());
trailing_breaks.clear();
leading_break.clear();
} else {
if trailing_breaks.is_empty() { if trailing_breaks.is_empty() {
string.push(' '); string.push(' ');
} else { } else {
@ -1334,11 +1339,6 @@ impl<T: Iterator<Item=char>> Scanner<T> {
trailing_breaks.clear(); trailing_breaks.clear();
} }
leading_break.clear(); leading_break.clear();
} else {
string.extend(leading_break.chars());
string.extend(trailing_breaks.chars());
trailing_breaks.clear();
leading_break.clear();
} }
} else { } else {
string.extend(whitespaces.chars()); string.extend(whitespaces.chars());
@ -1407,7 +1407,12 @@ impl<T: Iterator<Item=char>> Scanner<T> {
if leading_blanks || !whitespaces.is_empty() { if leading_blanks || !whitespaces.is_empty() {
if leading_blanks { if leading_blanks {
if !leading_break.is_empty() { if leading_break.is_empty() {
string.extend(leading_break.chars());
string.extend(trailing_breaks.chars());
trailing_breaks.clear();
leading_break.clear();
} else {
if trailing_breaks.is_empty() { if trailing_breaks.is_empty() {
string.push(' '); string.push(' ');
} else { } else {
@ -1415,11 +1420,7 @@ impl<T: Iterator<Item=char>> Scanner<T> {
trailing_breaks.clear(); trailing_breaks.clear();
} }
leading_break.clear(); leading_break.clear();
} else {
string.extend(leading_break.chars());
string.extend(trailing_breaks.chars());
trailing_breaks.clear();
leading_break.clear();
} }
leading_blanks = false; leading_blanks = false;
} else { } else {
@ -1444,21 +1445,21 @@ impl<T: Iterator<Item=char>> Scanner<T> {
"while scanning a plain scalar, found a tab")); "while scanning a plain scalar, found a tab"));
} }
if !leading_blanks { if leading_blanks {
whitespaces.push(self.ch());
self.skip(); self.skip();
} else { } else {
whitespaces.push(self.ch());
self.skip(); self.skip();
} }
} else { } else {
self.lookahead(2); self.lookahead(2);
// Check if it is a first line break // Check if it is a first line break
if !leading_blanks { if leading_blanks {
self.read_break(&mut trailing_breaks);
} else {
whitespaces.clear(); whitespaces.clear();
self.read_break(&mut leading_break); self.read_break(&mut leading_break);
leading_blanks = true; leading_blanks = true;
} else {
self.read_break(&mut trailing_breaks);
} }
} }
self.lookahead(1); self.lookahead(1);

6
saphyr/src/yaml.rs
View file

@ -154,7 +154,9 @@ impl YamlLoader {
if node.1 > 0 { if node.1 > 0 {
self.anchor_map.insert(node.1, node.0.clone()); self.anchor_map.insert(node.1, node.0.clone());
} }
if !self.doc_stack.is_empty() { if self.doc_stack.is_empty() {
self.doc_stack.push(node);
} else {
let parent = self.doc_stack.last_mut().unwrap(); let parent = self.doc_stack.last_mut().unwrap();
match *parent { match *parent {
(Yaml::Array(ref mut v), _) => v.push(node.0), (Yaml::Array(ref mut v), _) => v.push(node.0),
@ -172,8 +174,6 @@ impl YamlLoader {
}, },
_ => unreachable!(), _ => unreachable!(),
} }
} else {
self.doc_stack.push(node);
} }
} }