Merge pull request #85 from Kintaro/index

Fixed Index trait and new PathBuf::new()

Author: alexcrichton

src/json.rs

@@ -1148,17 +1148,17 @@ impl Json {
 impl<'a> Index<&'a str>  for Json {
     type Output = Json;
 
-    fn index(&self, idx: & &str) -> &Json {
-        self.find(*idx).unwrap()
+    fn index(&self, idx: &str) -> &Json {
+        self.find(idx).unwrap()
     }
 }
 
 impl Index<usize> for Json {
     type Output = Json;
 
-    fn index<'a>(&'a self, idx: &usize) -> &'a Json {
+    fn index<'a>(&'a self, idx: usize) -> &'a Json {
         match self {
-            &Json::Array(ref v) => &v[*idx],
+            &Json::Array(ref v) => &v[idx],
             _ => panic!("can only index Json with usize if it is an array")
         }
     }

src/lib.rs

@@ -10,7 +10,7 @@
 
 //! Support code for encoding and decoding types.
 
-#![feature(core, std_misc)]
+#![feature(core, convert)]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/rustc-serialize/")]

src/serialize.rs

@@ -570,14 +570,14 @@ impl Decodable for path::PathBuf {
         use std::os::unix::prelude::*;
         let bytes: Vec<u8> = try!(Decodable::decode(d));
         let s: OsString = OsStringExt::from_vec(bytes);
-        Ok(path::PathBuf::new(&s))
+        Ok(path::PathBuf::from(s))
     }
     #[cfg(windows)]
     fn decode<D: Decoder>(d: &mut D) -> Result<path::PathBuf, D::Error> {
         use std::os::windows::prelude::*;
         let bytes: Vec<u16> = try!(Decodable::decode(d));
         let s: OsString = OsStringExt::from_wide(&bytes);
-        Ok(path::PathBuf::new(&s))
+        Ok(path::PathBuf::from(s))
     }
 }