aboutsummaryrefslogtreecommitdiffstats
path: root/components/compositing/lib.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-06-25 12:03:15 -0600
committerbors-servo <metajack+bors@gmail.com>2015-06-25 12:03:15 -0600
commit21b48fc44d0b32627918b4778fed16203eecdba5 (patch)
treea1a33e5d94c0c2002efba55844a7849086fb5a04 /components/compositing/lib.rs
parent57cc84b2935c429c92774649275625a7fd63973c (diff)
parent73a7e92bfdc6499c486fd0ebd8b3cc72ed285a98 (diff)
downloadservo-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/compositing/lib.rs')
-rw-r--r--components/compositing/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index fbb8070892c..ba2934216e6 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(box_syntax)]
-#![feature(collections)]
-#![feature(core)]
+#![feature(slice_bytes)]
+#![feature(vec_push_all)]
#[macro_use]
extern crate log;