diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-25 12:03:15 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-25 12:03:15 -0600 |
| commit | 21b48fc44d0b32627918b4778fed16203eecdba5 (patch) | |
| tree | a1a33e5d94c0c2002efba55844a7849086fb5a04 /components/style/lib.rs | |
| parent | 57cc84b2935c429c92774649275625a7fd63973c (diff) | |
| parent | 73a7e92bfdc6499c486fd0ebd8b3cc72ed285a98 (diff) | |
| download | servo-21b48fc44d0b32627918b4778fed16203eecdba5.tar.gz servo-21b48fc44d0b32627918b4778fed16203eecdba5.zip | |
Auto merge of #6459 - servo:rustup_20150625, r=SimonSapin
Update to rustc 2d0cbf3e3e25e092bd9e4c94d08e446b680869f0.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6459)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/lib.rs')
| -rw-r--r-- | components/style/lib.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/components/style/lib.rs b/components/style/lib.rs index 4867bac20c0..bd84d33884a 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -2,13 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![feature(alloc)] -#![feature(plugin)] +#![feature(arc_unique)] #![feature(box_syntax)] -#![feature(core)] -#![feature(collections)] -#![feature(hash)] -#![feature(custom_attribute, custom_derive)] +#![feature(core_intrinsics)] +#![feature(custom_attribute)] +#![feature(custom_derive)] +#![feature(hasher_write)] +#![feature(plugin)] +#![feature(vec_push_all)] +#![feature(vec_push_all)] + #![plugin(string_cache_plugin)] #![plugin(plugins)] |