about summary refs log tree commit diff
path: root/src/libserialize/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-28 02:50:51 +0000
committerbors <bors@rust-lang.org>2017-01-28 02:50:51 +0000
commit0f8a296475d8bc27dfa48ec1053cec8fa2f73673 (patch)
treeddda8dff0a83c98eb56a0152b4c758d95efb32bb /src/libserialize/lib.rs
parent154c202afb256c379b7d454ec0244da69eaa2ced (diff)
parent1767d9715c7e90ef9add83d866066a69b2103806 (diff)
downloadrust-0f8a296475d8bc27dfa48ec1053cec8fa2f73673.tar.gz
rust-0f8a296475d8bc27dfa48ec1053cec8fa2f73673.zip
Auto merge of #39353 - alexcrichton:rollup, r=alexcrichton
Rollup of 21 pull requests

- Successful merges: #38617, #39284, #39285, #39290, #39302, #39305, #39306, #39307, #39311, #39313, #39314, #39321, #39325, #39332, #39335, #39344, #39345, #39346, #39348, #39350, #39351
- Failed merges:
Diffstat (limited to 'src/libserialize/lib.rs')
-rw-r--r--src/libserialize/lib.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 2cfc3924c03..1cb83fa33da 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -30,7 +30,6 @@ Core encoding and decoding interfaces.
 #![feature(box_syntax)]
 #![feature(collections)]
 #![feature(core_intrinsics)]
-#![feature(enumset)]
 #![feature(specialization)]
 #![feature(staged_api)]
 #![cfg_attr(test, feature(test))]