aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/lib.rs
diff options
context:
space:
mode:
authorAlex Touchet <alextouchet@outlook.com>2018-09-11 09:06:42 -0700
committerGitHub <noreply@github.com>2018-09-11 09:06:42 -0700
commit025b5550fc6f1fd74605b09973ffc606dae7432c (patch)
tree7dfb1026318b7a0135273b667d3f44e3ee8d737d /components/script/lib.rs
parent9a7e1d17f0e054cb9f7eaafeee943a2ec5bc5e26 (diff)
parent049eb6887e29d8409b1dfe55bc31803f1c3220da (diff)
downloadservo-025b5550fc6f1fd74605b09973ffc606dae7432c.tar.gz
servo-025b5550fc6f1fd74605b09973ffc606dae7432c.zip
Merge branch 'master' into tidy
Diffstat (limited to 'components/script/lib.rs')
-rw-r--r--components/script/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/lib.rs b/components/script/lib.rs
index d7a57a28898..416eaec06f7 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -5,11 +5,10 @@
#![cfg_attr(feature = "unstable", feature(core_intrinsics))]
#![cfg_attr(feature = "unstable", feature(on_unimplemented))]
#![feature(const_fn)]
+#![feature(drain_filter)]
#![feature(mpsc_select)]
#![feature(plugin)]
-#![feature(string_retain)]
#![feature(try_from)]
-#![feature(use_extern_macros)]
#![deny(unsafe_code)]
#![allow(non_snake_case)]
@@ -125,6 +124,7 @@ pub mod script_thread;
mod serviceworker_manager;
mod serviceworkerjob;
mod stylesheet_loader;
+mod task_queue;
mod task_source;
pub mod test;
pub mod textinput;