diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-03 19:20:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 19:20:59 -0800 |
| commit | 1e927ca88bf6622d5a87db75863f76976a1df56c (patch) | |
| tree | 22f2bb7edba60697ec4d6dbfe5bf3a75cfc48029 /components/script | |
| parent | 220e6e40142141c8c857da53aafc607923930194 (diff) | |
| parent | b9d99390ad4e3f0fc0efa642fa260ca2ed1f7303 (diff) | |
| download | servo-1e927ca88bf6622d5a87db75863f76976a1df56c.tar.gz servo-1e927ca88bf6622d5a87db75863f76976a1df56c.zip | |
Auto merge of #14835 - bholley:external_atomic_refcell, r=Manishearth
Switch to crates.io for atomic_refcell
r? @Manishearth
See #14828 for backstory.
<!-- 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/14835)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/script/layout_wrapper.rs | 2 | ||||
| -rw-r--r-- | components/script/lib.rs | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 05af21f1dc1..01e4079ccde 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -24,6 +24,7 @@ tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} angle = {git = "https://github.com/servo/angle", branch = "servo"} app_units = "0.3" audio-video-metadata = "0.1.2" +atomic_refcell = "0.1" bitflags = "0.7" bluetooth_traits = {path = "../bluetooth_traits"} canvas_traits = {path = "../canvas_traits"} diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 3e245ccdd35..25150d60dfe 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -30,6 +30,7 @@ #![allow(unsafe_code)] +use atomic_refcell::AtomicRefCell; use dom::bindings::inheritance::{CharacterDataTypeId, ElementTypeId}; use dom::bindings::inheritance::{HTMLElementTypeId, NodeTypeId}; use dom::bindings::js::LayoutJS; @@ -58,7 +59,6 @@ use std::marker::PhantomData; use std::mem::transmute; use std::sync::Arc; use std::sync::atomic::Ordering; -use style::atomic_refcell::AtomicRefCell; use style::attr::AttrValue; use style::computed_values::display; use style::context::{QuirksMode, SharedStyleContext}; diff --git a/components/script/lib.rs b/components/script/lib.rs index 52c0cd6f358..d47156b126f 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -28,6 +28,7 @@ extern crate angle; extern crate app_units; +extern crate atomic_refcell; extern crate audio_video_metadata; #[allow(unused_extern_crates)] #[macro_use] |