diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index c20e7f4aaec..b64f16aff59 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -338,7 +338,6 @@ mod test { use extra::serialize::Encodable; use extra; use std::io; - use std::io::Decorator; use std::io::mem::MemWriter; use std::str; use codemap::{Span, BytePos, Spanned}; @@ -356,7 +355,7 @@ mod test { let mut writer = MemWriter::new(); let mut encoder = extra::json::Encoder::new(&mut writer as &mut io::Writer); val.encode(&mut encoder); - str::from_utf8_owned(writer.inner()) + str::from_utf8_owned(writer.unwrap()) } // produce a codemap::span diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 9725d6e38de..82a7d550f64 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -32,7 +32,6 @@ use std::cell::RefCell; use std::char; use std::str; use std::io; -use std::io::Decorator; use std::io::mem::MemWriter; // The &mut ps is stored here to prevent recursive type. @@ -2322,7 +2321,7 @@ pub fn print_string(s: &mut ps, st: &str, style: ast::StrStyle) { // downcasts. unsafe fn get_mem_writer(writer: &mut ~io::Writer) -> ~str { let (_, wr): (uint, ~MemWriter) = cast::transmute_copy(writer); - let result = str::from_utf8_owned(wr.inner_ref().to_owned()); + let result = str::from_utf8_owned(wr.get_ref().to_owned()); cast::forget(wr); result } |
