Update to rust master
This commit is contained in:
parent
31ee496621
commit
2557fc9ab9
|
@ -741,7 +741,7 @@ impl<'a> Parser<'a> {
|
|||
}
|
||||
match *into.get_mut(&key).unwrap() {
|
||||
Array(ref mut vec) => {
|
||||
match vec.as_slice().head() {
|
||||
match vec.as_slice().first() {
|
||||
Some(ref v) if !v.same_type(&value) => {
|
||||
self.errors.push(ParserError {
|
||||
lo: key_lo,
|
||||
|
|
|
@ -50,7 +50,7 @@ impl<'a, 'b> Printer<'a, 'b> {
|
|||
match *v {
|
||||
Table(..) => continue,
|
||||
Array(ref a) => {
|
||||
match a.as_slice().head() {
|
||||
match a.as_slice().first() {
|
||||
Some(&Table(..)) => continue,
|
||||
_ => {}
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ impl<'a, 'b> Printer<'a, 'b> {
|
|||
self.stack.pop();
|
||||
}
|
||||
Array(ref inner) => {
|
||||
match inner.as_slice().head() {
|
||||
match inner.as_slice().first() {
|
||||
Some(&Table(..)) => {}
|
||||
_ => continue
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ fn to_json(toml: Value) -> Json {
|
|||
Boolean(b) => doit("bool", Json::String(b.to_string())),
|
||||
Datetime(s) => doit("datetime", Json::String(s)),
|
||||
Array(arr) => {
|
||||
let is_table = match arr.as_slice().head() {
|
||||
let is_table = match arr.as_slice().first() {
|
||||
Some(&Table(..)) => true,
|
||||
_ => false,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue