about summary refs log tree commit diff
path: root/src/compiletest/errors.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-17 12:02:07 -0800
committerbors <bors@rust-lang.org>2014-01-17 12:02:07 -0800
commit9bf85a250c93fbd5e65440bba6d300908fb08b9a (patch)
treeb51dbfa6246381cdd109b87737e9385e40981b95 /src/compiletest/errors.rs
parent4098327b1fe1112ddf661b587be9eeec1d80adde (diff)
parent295b46fc08c8cc6da0a144cd90c401d5b26a1faf (diff)
downloadrust-9bf85a250c93fbd5e65440bba6d300908fb08b9a.tar.gz
rust-9bf85a250c93fbd5e65440bba6d300908fb08b9a.zip
auto merge of #11598 : alexcrichton/rust/io-export, r=brson
* Reexport io::mem and io::buffered structs directly under io, make mem/buffered
  private modules
* Remove with_mem_writer
* Remove DEFAULT_CAPACITY and use DEFAULT_BUF_SIZE (in io::buffered)

cc #11119
Diffstat (limited to 'src/compiletest/errors.rs')
-rw-r--r--src/compiletest/errors.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index b15bf73c193..3a6b1666c1e 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -8,8 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::io::buffered::BufferedReader;
-use std::io::File;
+use std::io::{BufferedReader, File};
 
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }