extra: missed a couple `@` in json

diff --git a/src/libextra/json.rs b/src/libextra/json.rs
index 1b2165fb4cf863bf0be76c6ad656638ab86853a7..30288a08c79df5c48f7c9370864495f6809a55ac 100644 (file)
--- a/src/libextra/json.rs
+++ b/src/libextra/json.rs
@@ -464,7 +464,7 @@ pub fn to_pretty_writer(&self, wr: &mut io::Writer) {
     pub fn to_pretty_str(&self) -> ~str {
         let mut s = MemWriter::new();
         self.to_pretty_writer(&mut s as &mut io::Writer);
-        str::from_utf8(s.inner_ref().as_slice())
+        str::from_utf8_owned(s.inner())
     }
 }
 
@@ -847,7 +847,7 @@ fn parse_object(&mut self) -> Result<Json, Error> {
 
 /// Decodes a json value from an `&mut io::Reader`
 pub fn from_reader(rdr: &mut io::Reader) -> Result<Json, Error> {
-    let s = str::from_utf8(rdr.read_to_end());
+    let s = str::from_utf8_owned(rdr.read_to_end());
     let mut parser = Parser::init(s.chars());
     parser.parse()
 }
@@ -1319,9 +1319,9 @@ fn to_json(&self) -> Json {
 impl to_str::ToStr for Json {
     /// Encodes a json value into a string
     fn to_str(&self) -> ~str {
-        let s = @mut MemWriter::new();
-        self.to_writer(s as @mut io::Writer);
-        str::from_utf8(s.inner_ref().as_slice())
+        let mut s = MemWriter::new();
+        self.to_writer(&mut s as &mut io::Writer);
+        str::from_utf8_owned(s.inner())
     }
 }
 
@@ -1507,14 +1507,14 @@ fn test_write_object() {
         assert_eq!(a.clone(), from_str(a.to_pretty_str()).unwrap());
     }
 
-    fn with_str_writer(f: |@mut io::Writer|) -> ~str {
+    fn with_str_writer(f: |&mut io::Writer|) -> ~str {
         use std::io::mem::MemWriter;
         use std::io::Decorator;
         use std::str;
 
-        let m = @mut MemWriter::new();
-        f(m as @mut io::Writer);
-        str::from_utf8(*m.inner_ref())
+        let mut m = MemWriter::new();
+        f(&mut m as &mut io::Writer);
+        str::from_utf8_owned(m.inner())
     }
 
     #[test]

diff --git a/src/libextra/test.rs b/src/libextra/test.rs
index ba9478e4448f2cccdebb176a7fce0dfd70afdf5f..7d6fd81c6141be77c5d8a0f41da48584c6a3ed0e 100644 (file)
--- a/src/libextra/test.rs
+++ b/src/libextra/test.rs
@@ -945,8 +945,9 @@ pub fn new() -> MetricMap {
     /// Load MetricDiff from a file.
     pub fn load(p: &Path) -> MetricMap {
         assert!(p.exists());
-        let f = @mut File::open(p) as @mut io::Reader;
-        let mut decoder = json::Decoder::init(json::from_reader(f).unwrap());
+        let mut f = File::open(p);
+        let value = json::from_reader(&mut f as &mut io::Reader).unwrap();
+        let mut decoder = json::Decoder::init(value);
         MetricMap(Decodable::decode(&mut decoder))
     }
 

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 5edafa1b1f69b0932f7fd4403cab1f8125a9d88e..b2fb72d983b906d8354201cffa8761a51cc97d0a 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -312,9 +312,12 @@ fn json_output(crate: clean::Crate, res: ~[plugins::PluginJson], dst: Path) {
     // FIXME #8335: yuck, Rust -> str -> JSON round trip! No way to .encode
     // straight to the Rust JSON representation.
     let crate_json_str = {
-        let w = @mut MemWriter::new();
-        crate.encode(&mut json::Encoder::init(w as @mut io::Writer));
-        str::from_utf8(*w.inner_ref())
+        let mut w = MemWriter::new();
+        {
+            let mut encoder = json::Encoder::init(&mut w as &mut io::Writer);
+            crate.encode(&mut encoder);
+        }
+        str::from_utf8_owned(w.inner())
     };
     let crate_json = match json::from_str(crate_json_str) {
         Ok(j) => j,

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 988e9958c2b83fca24eb1a66a2c25a25489a7a46..54a3dad94959d2ae523362d5d17a963aaf91f337 100644 (file)
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -346,7 +346,7 @@ fn to_json_str<'a, E: Encodable<extra::json::Encoder<'a>>>(val: &E) -> ~str {
         let mut writer = MemWriter::new();
         let mut encoder = extra::json::Encoder::init(&mut writer as &mut io::Writer);
         val.encode(&mut encoder);
-        str::from_utf8(*writer.inner_ref())
+        str::from_utf8_owned(writer.inner())
     }
 
     // produce a codemap::span