Format using rustfmt 1.0

This commit is contained in:
Tibo Delor 2018-12-13 18:35:01 +11:00
parent 04134ffc47
commit 0705722551
3 changed files with 24 additions and 15 deletions

View file

@ -334,7 +334,7 @@ fn need_quotes(string: &str) -> bool {
// http://yaml.org/type/null.html
"null", "Null", "NULL", "~",
]
.contains(&string)
.contains(&string)
|| string.starts_with('.')
|| string.parse::<i64>().is_ok()
|| string.parse::<f64>().is_ok()

View file

@ -483,10 +483,12 @@ impl<T: Iterator<Item = char>> Scanner<T> {
self.allow_simple_key();
}
}
'#' => while !is_breakz(self.ch()) {
self.skip();
self.lookahead(1);
},
'#' => {
while !is_breakz(self.ch()) {
self.skip();
self.lookahead(1);
}
}
_ => break,
}
}
@ -929,11 +931,13 @@ impl<T: Iterator<Item = char>> Scanner<T> {
self.lookahead(1);
}
if string.is_empty() || match self.ch() {
c if is_blankz(c) => false,
'?' | ':' | ',' | ']' | '}' | '%' | '@' | '`' => false,
_ => true,
} {
if string.is_empty()
|| match self.ch() {
c if is_blankz(c) => false,
'?' | ':' | ',' | ']' | '}' | '%' | '@' | '`' => false,
_ => true,
}
{
return Err(ScanError::new(start_mark, "while scanning an anchor or alias, did not find expected alphabetic or numeric character"));
}

View file

@ -409,7 +409,8 @@ a4:
a5: 'single_quoted'
a6: \"double_quoted\"
a7:
".to_owned();
"
.to_owned();
let out = YamlLoader::load_from_str(&s).unwrap();
let doc = &out[0];
assert_eq!(doc["a7"].as_str().unwrap(), "你好");
@ -652,7 +653,8 @@ hash:
with:
indentations
"#,
).unwrap()
)
.unwrap()
.into_iter()
.next()
.unwrap();
@ -663,7 +665,8 @@ hash:
with:
indentations
"#,
).unwrap()
)
.unwrap()
.into_iter()
.next()
.unwrap();
@ -674,7 +677,8 @@ hash:
with:
indentations
"#,
).unwrap()
)
.unwrap()
.into_iter()
.next()
.unwrap();
@ -685,7 +689,8 @@ hash:
with:
indentations
"#,
).unwrap()
)
.unwrap()
.into_iter()
.next()
.unwrap();