about summary refs log tree commit diff
path: root/src/librustc_data_structures/lib.rs
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-12-17 16:28:33 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2019-12-17 16:28:33 -0500
commit7f00a5f26a4687c0c667d2ca02cb73eef677ae2e (patch)
tree82ce6096679ca921b3eb76f24cf8480ecfc77802 /src/librustc_data_structures/lib.rs
parent3ed3b8bb7b100afecf7d5f52eafbb70fec27f537 (diff)
downloadrust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.tar.gz
rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.zip
Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"
This reverts commit 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537, reversing
changes made to 99b89533d4cdf7682ea4054ad0ee36c351d05df1.

We will reland a similar patch at a future date but for now we should get a nightly
released in a few hours with the parallel patch, so this should be
reverted to make sure that the next nightly is not parallel-enabled.
Diffstat (limited to 'src/librustc_data_structures/lib.rs')
-rw-r--r--src/librustc_data_structures/lib.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index 02611a36aae..fb541637e5f 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -24,7 +24,6 @@
 #![feature(integer_atomics)]
 #![feature(test)]
 #![feature(associated_type_bounds)]
-#![feature(cfg_target_has_atomic)]
 
 #![cfg_attr(unix, feature(libc))]