diff options
| author | bors <bors@rust-lang.org> | 2014-09-03 02:40:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-03 02:40:59 +0000 |
| commit | f7ec95efbb96f8e9bcb8b5e71b5d13803e840dc9 (patch) | |
| tree | 7a86e9affd42434d280540f8208e710b78482e98 /src/libstd | |
| parent | 2e385817926f6f914fbff482aab3a8b627e7feee (diff) | |
| parent | 7f72884f1366ee9a46cd2b231c09c5c0e44f7ba3 (diff) | |
| download | rust-f7ec95efbb96f8e9bcb8b5e71b5d13803e840dc9.tar.gz rust-f7ec95efbb96f8e9bcb8b5e71b5d13803e840dc9.zip | |
auto merge of #16917 : nick29581/rust/cross-trait, r=pcwalton
Closes #15349 r? @pcwalton (or anyone else)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/failure.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/failure.rs b/src/libstd/failure.rs index 8c709d20d19..8d715de16e6 100644 --- a/src/libstd/failure.rs +++ b/src/libstd/failure.rs @@ -81,7 +81,7 @@ pub fn on_fail(obj: &Any + Send, file: &'static str, line: uint) { "task '{}' failed at '{}', {}:{}\n", n, msg, file, line); if backtrace::log_enabled() { - let _ = backtrace::write(stderr); + let _ = backtrace::write(&mut *stderr); } local_stderr.replace(Some(stderr)); } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index fea161c426a..bd837b6f7b5 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -203,7 +203,7 @@ fn with_task_stdout(f: |&mut Writer| -> IoResult<()>) { let mut my_stdout = local_stdout.replace(None).unwrap_or_else(|| { box stdout() as Box<Writer + Send> }); - let result = f(my_stdout); + let result = f(&mut *my_stdout); local_stdout.replace(Some(my_stdout)); result } else { |