about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-04 04:15:20 -0700
committerGitHub <noreply@github.com>2016-10-04 04:15:20 -0700
commit4a9af010ebc728bc4798b1ba30de0322c1f0138a (patch)
tree3bff48d27899b511dc1a9c7993de557cb06b887b /src/libstd/sync
parent5ea241b9fb411b42f0173113d43ef1020ca3df70 (diff)
parent177aabdfe3c47412d8d29d9d726640a5134a6b7d (diff)
downloadrust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.tar.gz
rust-4a9af010ebc728bc4798b1ba30de0322c1f0138a.zip
Auto merge of #36953 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests

- Successful merges: #36798, #36878, #36902, #36903, #36908, #36916, #36917, #36921, #36928, #36938, #36941, #36951
- Failed merges:
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/select.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs
index e056a350815..8b4da532af6 100644
--- a/src/libstd/sync/mpsc/select.rs
+++ b/src/libstd/sync/mpsc/select.rs
@@ -352,14 +352,12 @@ impl Iterator for Packets {
     }
 }
 
-#[stable(feature = "mpsc_debug", since = "1.7.0")]
 impl fmt::Debug for Select {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "Select {{ .. }}")
     }
 }
 
-#[stable(feature = "mpsc_debug", since = "1.7.0")]
 impl<'rx, T:Send+'rx> fmt::Debug for Handle<'rx, T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "Handle {{ .. }}")