diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-08 18:21:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-27 10:14:50 -0700 |
| commit | bb9172d7b512c36f34d34b024640f030d1fde2eb (patch) | |
| tree | 0e4ea18ae30a12954db6b9fbe95f62222ade9301 /src/libstd/rt/unwind.rs | |
| parent | bdd24b2a56e8bf6b952bd8880364fb0a57c2c540 (diff) | |
Fix fallout of removing default bounds
This is all purely fallout of getting the previous commit to compile.
Diffstat (limited to 'src/libstd/rt/unwind.rs')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 7f54b8b3320..930e0858da1 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -76,7 +76,7 @@ use uw = rt::libunwind; pub struct Unwinder { priv unwinding: bool, - priv cause: Option<~Any> + priv cause: Option<~Any:Send> } impl Unwinder { @@ -126,7 +126,7 @@ impl Unwinder { } } - pub fn begin_unwind(&mut self, cause: ~Any) -> ! { + pub fn begin_unwind(&mut self, cause: ~Any:Send) -> ! { rtdebug!("begin_unwind()"); self.unwinding = true; @@ -372,7 +372,7 @@ pub fn begin_unwind<M: Any + Send>(msg: M, file: &'static str, line: uint) -> ! /// Do this split took the LLVM IR line counts of `fn main() { fail!() /// }` from ~1900/3700 (-O/no opts) to 180/590. #[inline(never)] #[cold] // this is the slow path, please never inline this -fn begin_unwind_inner(msg: ~Any, file: &'static str, line: uint) -> ! { +fn begin_unwind_inner(msg: ~Any:Send, file: &'static str, line: uint) -> ! { let mut task; { let msg_s = match msg.as_ref::<&'static str>() { |
