diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
| commit | 50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch) | |
| tree | 0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/librustc_driver | |
| parent | 85e997adfffa5e8511ff31710649038216028832 (diff) | |
| parent | ac77392f8ab1c201b0c927f6a2d30b632b95acda (diff) | |
| download | rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.tar.gz rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.zip | |
rollup merge of #23919: alexcrichton/stabilize-io-error
Conflicts: src/libstd/fs/tempdir.rs src/libstd/io/error.rs
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/lib.rs | 1 | ||||
| -rw-r--r-- | src/librustc_driver/pretty.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 450c8eb66c8..be416327dad 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -34,7 +34,6 @@ #![feature(unsafe_destructor)] #![feature(staged_api)] #![feature(exit_status)] -#![feature(io)] #![feature(set_stdio)] #![feature(unicode)] diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs index 9e693a64ef0..fe55ca3b73b 100644 --- a/src/librustc_driver/pretty.rs +++ b/src/librustc_driver/pretty.rs @@ -699,8 +699,8 @@ fn print_flowgraph<W: Write>(variants: Vec<borrowck_dot::Variant>, fn expand_err_details(r: io::Result<()>) -> io::Result<()> { r.map_err(|ioerr| { - io::Error::new(io::ErrorKind::Other, "graphviz::render failed", - Some(ioerr.to_string())) + io::Error::new(io::ErrorKind::Other, + &format!("graphviz::render failed: {}", ioerr)[..]) }) } } |