diff options
| author | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-16 08:16:49 +0000 |
| commit | 7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4 (patch) | |
| tree | 1ea55f8c25540e7339e27fe9dd79cadbc332634f /src/libstd/failure.rs | |
| parent | 2ef910f71ab83761b1f5f9144621f246622e92d8 (diff) | |
| parent | 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 (diff) | |
| download | rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.tar.gz rust-7ec78053ec5fcabd5f8ca98627dd45bfa5fc4cd4.zip | |
auto merge of #14900 : alexcrichton/rust/snapshots, r=huonw
Closes #14898 Closes #14918
Diffstat (limited to 'src/libstd/failure.rs')
| -rw-r--r-- | src/libstd/failure.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/failure.rs b/src/libstd/failure.rs index 903f39c7b06..d1552f0bd10 100644 --- a/src/libstd/failure.rs +++ b/src/libstd/failure.rs @@ -23,7 +23,7 @@ use str::Str; use string::String; // Defined in this module instead of io::stdio so that the unwinding -local_data_key!(pub local_stderr: Box<Writer:Send>) +local_data_key!(pub local_stderr: Box<Writer + Send>) impl Writer for Stdio { fn write(&mut self, bytes: &[u8]) -> IoResult<()> { @@ -35,7 +35,7 @@ impl Writer for Stdio { } } -pub fn on_fail(obj: &Any:Send, file: &'static str, line: uint) { +pub fn on_fail(obj: &Any + Send, file: &'static str, line: uint) { let msg = match obj.as_ref::<&'static str>() { Some(s) => *s, None => match obj.as_ref::<String>() { |