about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorStjepan Glavina <stjepang@gmail.com>2018-11-08 14:20:45 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-11-08 22:51:46 +0100
commitd75dae306989369760eb20860a8a72eb4d15a18b (patch)
treed27f14f3e810decbf28ba8e1e20dec8310ee2a50 /src/libstd/sync
parent653da4fd006c97625247acd7e076d0782cdc149b (diff)
downloadrust-d75dae306989369760eb20860a8a72eb4d15a18b.tar.gz
rust-d75dae306989369760eb20860a8a72eb4d15a18b.zip
Deprecate channel selection
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/mod.rs1
-rw-r--r--src/libstd/sync/mpsc/select.rs7
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 81f98a55c11..059ced4f56e 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -124,6 +124,7 @@
 //! ```
 
 #![stable(feature = "rust1", since = "1.0.0")]
+#![allow(deprecated)] // for mpsc_select
 
 // A description of how Rust's channel implementation works
 //
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs
index a7a284cfb79..2ec4b52dbf3 100644
--- a/src/libstd/sync/mpsc/select.rs
+++ b/src/libstd/sync/mpsc/select.rs
@@ -51,11 +51,10 @@
 #![unstable(feature = "mpsc_select",
             reason = "This implementation, while likely sufficient, is unsafe and \
                       likely to be error prone. At some point in the future this \
-                      module will likely be replaced, and it is currently \
-                      unknown how much API breakage that will cause. The ability \
-                      to select over a number of channels will remain forever, \
-                      but no guarantees beyond this are being made",
+                      module will be removed.",
             issue = "27800")]
+#![rustc_deprecated(since = "1.32.0",
+                    reason = "channel selection will be removed in a future release")]
 
 
 use fmt;