diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 22:59:08 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 22:59:08 +0530 |
commit | 4807dadf19175d38414130a74eb1163c65129ba6 (patch) | |
tree | 7a8dda8fa935b15fa0d34e95df590d7c8ffc789a /components/util/thread.rs | |
parent | e21e5551ec96831d7b001933b2e5588aff9fbccc (diff) | |
parent | 941093d9834a1f4a6d6bec8b798e38bbf165a3c8 (diff) | |
download | servo-4807dadf19175d38414130a74eb1163c65129ba6.tar.gz servo-4807dadf19175d38414130a74eb1163c65129ba6.zip |
Auto merge of #10609 - asajeffrey:add-panic-object-borrows, r=Manishearth
Make add_panic_object in thread.rs borrow rather than own the object.
r? @Manishearth
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10609)
<!-- Reviewable:end -->
Diffstat (limited to 'components/util/thread.rs')
-rw-r--r-- | components/util/thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/util/thread.rs b/components/util/thread.rs index b8fba1aa773..aa0baac20aa 100644 --- a/components/util/thread.rs +++ b/components/util/thread.rs @@ -57,7 +57,7 @@ pub fn spawn_named<F>(name: String, f: F) pub trait AddFailureDetails { fn add_panic_message(&mut self, message: String); - fn add_panic_object(&mut self, object: Box<Any>) { + fn add_panic_object(&mut self, object: &Any) { if let Some(message) = object.downcast_ref::<String>() { self.add_panic_message(message.to_owned()); } else if let Some(&message) = object.downcast_ref::<&'static str>() { @@ -111,7 +111,7 @@ pub fn spawn_named_with_send_on_failure<F, T, S>(name: String, Ok(()) => (), Err(err) => { debug!("{} failed, notifying constellation", name); - msg.add_panic_object(err); + msg.add_panic_object(&*err); dest.send_on_failure(S::Value::from(msg)); } } |