diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-19 10:35:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-19 10:35:08 -0500 |
commit | fe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b (patch) | |
tree | 84fe331eb4af20575050134b234b6c99a252726d /components/script/script_thread.rs | |
parent | 07e9794306d597afe5d90d192fd32a99572c3cc3 (diff) | |
parent | e8e2d0a4b24475b018dbc7e59ea46fdceaf20815 (diff) | |
download | servo-fe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b.tar.gz servo-fe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b.zip |
Auto merge of #18809 - Eijebong:bitflags, r=nox
Update bitflags to 1.0 in every servo crate
It still needs dependencies update to remove all the other bitflags
versions.
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it's a dependency update
<!-- 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/18809)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 8f17afaf9a7..2f0431acda8 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -114,7 +114,7 @@ use std::result::Result; use std::sync::Arc; use std::sync::mpsc::{Receiver, Select, Sender, channel}; use std::thread; -use style::thread_state; +use style::thread_state::{self, ThreadState}; use task_source::dom_manipulation::DOMManipulationTaskSource; use task_source::file_reading::FileReadingTaskSource; use task_source::history_traversal::HistoryTraversalTaskSource; @@ -544,7 +544,7 @@ impl ScriptThreadFactory for ScriptThread { let (sender, receiver) = channel(); let layout_chan = sender.clone(); thread::Builder::new().name(format!("ScriptThread {:?}", state.id)).spawn(move || { - thread_state::initialize(thread_state::SCRIPT); + thread_state::initialize(ThreadState::SCRIPT); PipelineNamespace::install(state.pipeline_namespace_id); TopLevelBrowsingContextId::install(state.top_level_browsing_context_id); let roots = RootCollection::new(); |