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/devtools/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/devtools/lib.rs')
-rw-r--r-- | components/devtools/lib.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index fd3dba4f1be..f0fca1a9b0e 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -10,7 +10,11 @@ #![crate_name = "devtools"] #![crate_type = "rlib"] -#![feature(box_syntax, core)] +#![feature(box_syntax)] +#![feature(core)] +#![feature(get_type_id)] +#![feature(raw)] +#![feature(reflect_marker)] #![allow(non_snake_case)] |