diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-02 21:49:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 21:49:08 -0500 |
commit | c6e15f8ef244a0f3859489ca7f1c7bcc80181468 (patch) | |
tree | d323a325152393e9290480d78af257147a445441 /components/script/lib.rs | |
parent | 70641a777ad4d0d566857aa01983a46a43724699 (diff) | |
parent | 391296278db4e815daaa72e62bacd88dbde9f7b1 (diff) | |
download | servo-c6e15f8ef244a0f3859489ca7f1c7bcc80181468.tar.gz servo-c6e15f8ef244a0f3859489ca7f1c7bcc80181468.zip |
Auto merge of #14028 - servo:rustup, r=nox,SimonSapin
Update Rust to 1.14.0-nightly (7c69b0d5a 2016-11-01)
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14028)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/lib.rs')
-rw-r--r-- | components/script/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/lib.rs b/components/script/lib.rs index c679a5950d3..ed4fcf8b5ee 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -14,6 +14,7 @@ #![feature(on_unimplemented)] #![feature(optin_builtin_traits)] #![feature(plugin)] +#![feature(proc_macro)] #![feature(slice_patterns)] #![feature(stmt_expr_attributes)] #![feature(try_from)] @@ -24,7 +25,6 @@ #![doc = "The script crate contains all matters DOM."] -#![plugin(heapsize_plugin)] #![plugin(phf_macros)] #![plugin(plugins)] @@ -46,6 +46,7 @@ extern crate euclid; extern crate fnv; extern crate gfx_traits; extern crate heapsize; +#[macro_use] extern crate heapsize_derive; extern crate html5ever; extern crate hyper; extern crate hyper_serde; @@ -53,6 +54,8 @@ extern crate image; extern crate ipc_channel; #[macro_use] extern crate js; +#[macro_use] +extern crate jstraceable_derive; extern crate libc; #[macro_use] extern crate log; |