From 71d1689d63ef1af41addef330e314a56e88f48a9 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 31 Oct 2014 08:27:24 -0700 Subject: Update to rust master --- src/lib.rs | 4 ++-- src/serialization.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 7a89445..a9b42b7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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), diff --git a/src/serialization.rs b/src/serialization.rs index 2573f5f..afaa425 100644 --- a/src/serialization.rs +++ b/src/serialization.rs @@ -639,14 +639,14 @@ impl serialize::Decoder for Decoder { -> Result { 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, _ => {} }, _ => {} -- cgit v1.2.3