about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-09-22 13:11:04 -0700
committerGitHub <noreply@github.com>2016-09-22 13:11:04 -0700
commit4c04e36f94c4b85b613a2d5fe5c9511053cbdec2 (patch)
treef64b8be295c1dbf85c95dbf4411f1b8b9dcd0d88 /src/libstd/sync
parent458f41121374291ac1c0d84dd24123d5edcb2967 (diff)
parentc1e39380fbb04691cdcf6c58e2c0054110fa698c (diff)
downloadrust-4c04e36f94c4b85b613a2d5fe5c9511053cbdec2.tar.gz
rust-4c04e36f94c4b85b613a2d5fe5c9511053cbdec2.zip
Auto merge of #36651 - jonathandturner:rollup, r=jonathandturner
Rollup of 7 pull requests

- Successful merges: #36330, #36423, #36539, #36571, #36589, #36600, #36632
- Failed merges:
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/select.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs
index 677544d335e..51b08bd75c4 100644
--- a/src/libstd/sync/mpsc/select.rs
+++ b/src/libstd/sync/mpsc/select.rs
@@ -103,7 +103,7 @@ pub struct Handle<'rx, T:Send+'rx> {
 struct Packets { cur: *mut Handle<'static, ()> }
 
 #[doc(hidden)]
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum StartResult {
     Installed,
     Abort,