Update to rust master

This commit is contained in:
Alex Crichton 2014-10-31 08:27:24 -07:00
parent 7b2aa23dbd
commit 71d1689d63
2 changed files with 4 additions and 4 deletions

View file

@ -39,7 +39,7 @@
#![crate_name = "toml"]
#![crate_type = "lib"]
#![feature(macro_rules)]
#![deny(missing_doc)]
#![deny(missing_docs)]
extern crate serialize;
@ -62,7 +62,7 @@ mod serialization;
#[cfg(test)]mod test;
/// Representation of a TOML value.
#[deriving(PartialEq, Clone)]
#[allow(missing_doc)]
#[allow(missing_docs)]
pub enum Value {
String(string::String),
Integer(i64),

View file

@ -639,14 +639,14 @@ impl serialize::Decoder<DecodeError> for Decoder {
-> Result<T, DecodeError>
{
let toml = match self.toml {
Some(Array(ref mut arr)) => mem::replace(arr.get_mut(idx), Integer(0)),
Some(Array(ref mut arr)) => mem::replace(&mut arr[idx], Integer(0)),
ref found => return Err(self.mismatch("array", found)),
};
let mut d = self.sub_decoder(Some(toml), "");
let ret = try!(f(&mut d));
match d.toml {
Some(toml) => match self.toml {
Some(Array(ref mut arr)) => *arr.get_mut(idx) = toml,
Some(Array(ref mut arr)) => arr[idx] = toml,
_ => {}
},
_ => {}