asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to rust master

Browse source
This commit is contained in:
Alex Crichton 2015-01-01 08:48:47 -08:00
parent 31ee496621
commit 2557fc9ab9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parser.rs
View file

@ -741,7 +741,7 @@ impl<'a> Parser<'a> {
} }
match *into.get_mut(&key).unwrap() { match *into.get_mut(&key).unwrap() {
Array(ref mut vec) => { Array(ref mut vec) => {
match vec.as_slice().head() { match vec.as_slice().first() {
Some(ref v) if !v.same_type(&value) => { Some(ref v) if !v.same_type(&value) => {
self.errors.push(ParserError { self.errors.push(ParserError {
lo: key_lo, lo: key_lo,

4
src/show.rs
View file

@ -50,7 +50,7 @@ impl<'a, 'b> Printer<'a, 'b> {
match *v { match *v {
Table(..) => continue, Table(..) => continue,
Array(ref a) => { Array(ref a) => {
match a.as_slice().head() { match a.as_slice().first() {
Some(&Table(..)) => continue, Some(&Table(..)) => continue,
_ => {} _ => {}
} }
@ -69,7 +69,7 @@ impl<'a, 'b> Printer<'a, 'b> {
self.stack.pop(); self.stack.pop();
} }
Array(ref inner) => { Array(ref inner) => {
match inner.as_slice().head() { match inner.as_slice().first() {
Some(&Table(..)) => {} Some(&Table(..)) => {}
_ => continue _ => continue
} }

2
src/test/valid.rs
View file

@ -30,7 +30,7 @@ fn to_json(toml: Value) -> Json {
Boolean(b) => doit("bool", Json::String(b.to_string())), Boolean(b) => doit("bool", Json::String(b.to_string())),
Datetime(s) => doit("datetime", Json::String(s)), Datetime(s) => doit("datetime", Json::String(s)),
Array(arr) => { Array(arr) => {
let is_table = match arr.as_slice().head() { let is_table = match arr.as_slice().first() {
Some(&Table(..)) => true, Some(&Table(..)) => true,
_ => false, _ => false,
}; };