remove `NoSendItem` and `NoSyncItem`

diff --git a/src/doc/reference.md b/src/doc/reference.md
index d3af4ab1c7467574d076cd6c654c6c1a08181127..3cbfad52c05239fddba07c90bae99337c9255f9e 100644 (file)
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -2377,10 +2377,6 @@ These types help drive the compiler's analysis
   : ___Needs filling in___
 * `no_copy_bound`
   : This type does not implement "copy", even if eligible.
-* `no_send_bound`
-  : This type does not implement "send", even if eligible.
-* `no_sync_bound`
-  : This type does not implement "sync", even if eligible.
 * `eh_personality`
   : ___Needs filling in___
 * `exchange_free`

diff --git a/src/doc/trpl/unsafe.md b/src/doc/trpl/unsafe.md
index 2a66b4a01f7a9a80eeac456c6f3816b2eabcb6da..3acd1eefe89d06f1b7a8578eaa76c1ff7b4b13b4 100644 (file)
--- a/src/doc/trpl/unsafe.md
+++ b/src/doc/trpl/unsafe.md
@@ -707,7 +707,7 @@ Other features provided by lang items include:
   various kinds; lang items `send`, `sync` and `copy`.
 - the marker types and variance indicators found in
   `std::marker`; lang items `covariant_type`,
-  `contravariant_lifetime`, `no_sync_bound`, etc.
+  `contravariant_lifetime`, etc.
 
 Lang items are loaded lazily by the compiler; e.g. if one never uses
 `Box` then there is no need to define functions for `exchange_malloc`

diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs
index ff79ace992409f0ae50ca7a684b031dcefb32e6b..2c0de9d16348618359f78709e9739e031031329e 100644 (file)
--- a/src/librustc/middle/lang_items.rs
+++ b/src/librustc/middle/lang_items.rs
@@ -320,9 +320,7 @@ pub fn collect_language_items(krate: &ast::Crate,
     ContravariantLifetimeItem,       "contravariant_lifetime",  contravariant_lifetime;
     InvariantLifetimeItem,           "invariant_lifetime",      invariant_lifetime;
 
-    NoSendItem,                      "no_send_bound",           no_send_bound;
     NoCopyItem,                      "no_copy_bound",           no_copy_bound;
-    NoSyncItem,                      "no_sync_bound",           no_sync_bound;
     ManagedItem,                     "managed_bound",           managed_bound;
 
     NonZeroItem,                     "non_zero",                non_zero;

diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs
index 62649653a6972374b5be5bfb901882e28f52d3eb..e8d82150ade4bd2888c9d06ad5c93b7e1beafd4d 100644 (file)
--- a/src/librustc/middle/traits/select.rs
+++ b/src/librustc/middle/traits/select.rs
@@ -1554,10 +1554,7 @@ fn nominal<'cx, 'tcx>(this: &mut SelectionContext<'cx, 'tcx>,
             let tcx = this.tcx();
             match bound {
                 ty::BoundSend => {
-                    if
-                        Some(def_id) == tcx.lang_items.no_send_bound() ||
-                        Some(def_id) == tcx.lang_items.managed_bound()
-                    {
+                    if Some(def_id) == tcx.lang_items.managed_bound() {
                         return Err(Unimplemented)
                     }
                 }
@@ -1568,7 +1565,6 @@ fn nominal<'cx, 'tcx>(this: &mut SelectionContext<'cx, 'tcx>,
 
                 ty::BoundSync => {
                     if
-                        Some(def_id) == tcx.lang_items.no_sync_bound() ||
                         Some(def_id) == tcx.lang_items.managed_bound() ||
                         Some(def_id) == tcx.lang_items.unsafe_type()
                     {