aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_runtime.rs
diff options
context:
space:
mode:
authorBastien Orivel <eijebong@bananium.fr>2017-10-09 17:03:40 +0200
committerBastien Orivel <eijebong@bananium.fr>2017-10-19 15:01:17 +0200
commite8e2d0a4b24475b018dbc7e59ea46fdceaf20815 (patch)
treebd56b4a2fc203150ee5c3b5e163937fb3b4e1989 /components/script/script_runtime.rs
parent4cf2ce66fc4f970a47ab1fb4b9aa1a55282640f7 (diff)
downloadservo-e8e2d0a4b24475b018dbc7e59ea46fdceaf20815.tar.gz
servo-e8e2d0a4b24475b018dbc7e59ea46fdceaf20815.zip
Update bitflags to 1.0 in every servo crate
It still needs dependencies update to remove all the other bitflags versions.
Diffstat (limited to 'components/script/script_runtime.rs')
-rw-r--r--components/script/script_runtime.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
index 7985f562cbe..9416e0d11ae 100644
--- a/components/script/script_runtime.rs
+++ b/components/script/script_runtime.rs
@@ -33,7 +33,7 @@ use std::os;
use std::os::raw::c_void;
use std::panic::AssertUnwindSafe;
use std::ptr;
-use style::thread_state;
+use style::thread_state::{self, ThreadState};
use task::TaskBox;
use time::{Tm, now};
@@ -394,8 +394,8 @@ unsafe extern "C" fn gc_slice_callback(_rt: *mut JSRuntime, progress: GCProgress
#[allow(unsafe_code)]
unsafe extern "C" fn debug_gc_callback(_rt: *mut JSRuntime, status: JSGCStatus, _data: *mut os::raw::c_void) {
match status {
- JSGCStatus::JSGC_BEGIN => thread_state::enter(thread_state::IN_GC),
- JSGCStatus::JSGC_END => thread_state::exit(thread_state::IN_GC),
+ JSGCStatus::JSGC_BEGIN => thread_state::enter(ThreadState::IN_GC),
+ JSGCStatus::JSGC_END => thread_state::exit(ThreadState::IN_GC),
}
}