diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-08 12:23:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 12:23:56 -0600 |
| commit | 5173a655219d5eff64d4702718cfa63c2c44e1b3 (patch) | |
| tree | fd2cdade252cf321ff169c5dff1d64d5756814eb | |
| parent | d1b7f19410cb882280287b482bd7178a6eb529b1 (diff) | |
| parent | 7ad9baca4e2fef3f072e114da0115991440b4303 (diff) | |
| download | servo-5173a655219d5eff64d4702718cfa63c2c44e1b3.tar.gz servo-5173a655219d5eff64d4702718cfa63c2c44e1b3.zip | |
Auto merge of #14119 - servo:jdm-patch-1, r=mbrubeck
Address common source of shutdown panics
Remove easy sources of intermittent failures during test shutdown. Might help #14118 and #14117.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14119)
<!-- Reviewable:end -->
| -rw-r--r-- | components/profile_traits/mem.rs | 2 | ||||
| -rw-r--r-- | components/profile_traits/time.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/profile_traits/mem.rs b/components/profile_traits/mem.rs index 794874581b9..b7da0d3e871 100644 --- a/components/profile_traits/mem.rs +++ b/components/profile_traits/mem.rs @@ -19,7 +19,7 @@ pub trait OpaqueSender<T> { impl<T> OpaqueSender<T> for Sender<T> { fn send(&self, message: T) { - Sender::send(self, message).unwrap(); + let _ = Sender::send(self, message); } } diff --git a/components/profile_traits/time.rs b/components/profile_traits/time.rs index ec8a3617cd6..7068a7261e4 100644 --- a/components/profile_traits/time.rs +++ b/components/profile_traits/time.rs @@ -22,7 +22,7 @@ pub struct ProfilerChan(pub IpcSender<ProfilerMsg>); impl ProfilerChan { pub fn send(&self, msg: ProfilerMsg) { - self.0.send(msg).unwrap(); + let _ = self.0.send(msg); } } |