about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-07-04 10:05:50 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2019-07-04 11:26:57 -0400
commit8a7dded1a249a21540583333204c378bf960a700 (patch)
treea3f2218f1d0ec0a122a3b947ed837268aa688981 /src/libsyntax
parentb43eb4235ac43c822d903ad26ed806f34cc1a14a (diff)
downloadrust-8a7dded1a249a21540583333204c378bf960a700.tar.gz
rust-8a7dded1a249a21540583333204c378bf960a700.zip
Switch master to 1.38
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/tokenstream.rs11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs
index cd906bb282b..b32049b1da8 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/libsyntax/tokenstream.rs
@@ -59,17 +59,6 @@ where
     TokenStream: Send + Sync,
 {}
 
-// These are safe since we ensure that they hold for all fields in the `_dummy` function.
-//
-// These impls are only here because the compiler takes forever to compute the Send and Sync
-// bounds without them.
-// FIXME: Remove these impls when the compiler can compute the bounds quickly again.
-// See https://github.com/rust-lang/rust/issues/60846
-#[cfg(all(bootstrap, parallel_compiler))]
-unsafe impl Send for TokenTree {}
-#[cfg(all(bootstrap, parallel_compiler))]
-unsafe impl Sync for TokenTree {}
-
 impl TokenTree {
     /// Use this token tree as a matcher to parse given tts.
     pub fn parse(cx: &base::ExtCtxt<'_>, mtch: &[quoted::TokenTree], tts: TokenStream)