9 files changed, 12 insertions, 20 deletions
diff --git a/components/script/dom/bindings/constant.rs b/components/script/dom/bindings/constant.rs
index 4d88d485ee3..56f5356c916 100644
--- a/components/script/dom/bindings/constant.rs
+++ b/components/script/dom/bindings/constant.rs
@@ -9,7 +9,6 @@ use js::jsapi::{JSContext, JSPROP_ENUMERATE, JSPROP_PERMANENT};
 use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UInt32Value};
 use js::rust::wrappers::JS_DefineProperty;
 use js::rust::HandleObject;
-use libc;
 
 /// Representation of an IDL constant.
 #[derive(Clone)]
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index a96371aaf06..cf3e45dd770 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -40,7 +40,6 @@ use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::{ByteString, DOMString, USVString};
 use crate::dom::bindings::trace::{JSTraceable, RootedTraceableBox};
 use crate::dom::bindings::utils::DOMClass;
-use js;
 use js::conversions::latin1_to_string;
 pub use js::conversions::ConversionBehavior;
 pub use js::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible};
@@ -59,7 +58,6 @@ use js::jsval::{ObjectValue, StringValue, UndefinedValue};
 use js::rust::wrappers::{JS_GetProperty, JS_IsArrayObject};
 use js::rust::{get_object_class, is_dom_class, is_dom_object, maybe_wrap_value, ToString};
 use js::rust::{HandleId, HandleObject, HandleValue, MutableHandleValue};
-use libc;
 use num_traits::Float;
 use servo_config::opts;
 use std::{char, ffi, ptr, slice};
diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs
index 5389fabd07d..c7de37a202b 100644
--- a/components/script/dom/bindings/interface.rs
+++ b/components/script/dom/bindings/interface.rs
@@ -35,7 +35,6 @@ use js::rust::wrappers::{JS_FireOnNewGlobalObject, JS_GetPrototype};
 use js::rust::wrappers::{JS_LinkConstructorAndPrototype, JS_NewObjectWithUniqueType};
 use js::rust::{define_methods, define_properties, get_object_class};
 use js::rust::{HandleObject, HandleValue, MutableHandleObject};
-use libc;
 use std::convert::TryFrom;
 use std::ptr;
 
diff --git a/components/script/dom/bindings/namespace.rs b/components/script/dom/bindings/namespace.rs
index 505a5335830..bb20e7b3320 100644
--- a/components/script/dom/bindings/namespace.rs
+++ b/components/script/dom/bindings/namespace.rs
@@ -8,7 +8,6 @@ use crate::dom::bindings::guard::Guard;
 use crate::dom::bindings::interface::{create_object, define_on_global_object};
 use js::jsapi::{JSClass, JSContext, JSFunctionSpec};
 use js::rust::{HandleObject, MutableHandleObject};
-use libc;
 
 /// The class of a namespace object.
 #[derive(Clone, Copy)]
diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs
index ca6bf086960..636a393c83b 100644
--- a/components/script/dom/bindings/refcounted.rs
+++ b/components/script/dom/bindings/refcounted.rs
@@ -30,7 +30,6 @@ use crate::dom::bindings::trace::trace_reflector;
 use crate::dom::promise::Promise;
 use crate::task::TaskOnce;
 use js::jsapi::JSTracer;
-use libc;
 use std::cell::RefCell;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::collections::hash_map::HashMap;
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index 25b77e052e6..5318eb11e4d 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -78,14 +78,14 @@ where
 pub unsafe trait StableTraceObject {
     /// Returns a stable trace object which address won't change for the whole
     /// lifetime of the value.
-    fn stable_trace_object(&self) -> *const JSTraceable;
+    fn stable_trace_object(&self) -> *const dyn JSTraceable;
 }
 
 unsafe impl<T> StableTraceObject for Dom<T>
 where
     T: DomObject,
 {
-    fn stable_trace_object<'a>(&'a self) -> *const JSTraceable {
+    fn stable_trace_object<'a>(&'a self) -> *const dyn JSTraceable {
         // The JSTraceable impl for Reflector doesn't actually do anything,
         // so we need this shenanigan to actually trace the reflector of the
         // T pointer in Dom<T>.
@@ -198,7 +198,7 @@ where
 /// See also [*Exact Stack Rooting - Storing a GCPointer on the CStack*]
 /// (https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Internals/GC/Exact_Stack_Rooting).
 pub struct RootCollection {
-    roots: UnsafeCell<Vec<*const JSTraceable>>,
+    roots: UnsafeCell<Vec<*const dyn JSTraceable>>,
 }
 
 thread_local!(static STACK_ROOTS: Cell<Option<*const RootCollection>> = Cell::new(None));
@@ -228,13 +228,13 @@ impl RootCollection {
     }
 
     /// Starts tracking a trace object.
-    unsafe fn root(&self, object: *const JSTraceable) {
+    unsafe fn root(&self, object: *const dyn JSTraceable) {
         debug_assert!(thread_state::get().is_script());
         (*self.roots.get()).push(object);
     }
 
     /// Stops tracking a trace object, asserting if it isn't found.
-    unsafe fn unroot(&self, object: *const JSTraceable) {
+    unsafe fn unroot(&self, object: *const dyn JSTraceable) {
         debug_assert!(thread_state::get().is_script());
         let roots = &mut *self.roots.get();
         match roots.iter().rposition(|r| *r == object) {
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index d45bbdef121..d8d3000d037 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -375,7 +375,7 @@ unsafe_no_jsmanaged_fields!(usize, u8, u16, u32, u64);
 unsafe_no_jsmanaged_fields!(isize, i8, i16, i32, i64);
 unsafe_no_jsmanaged_fields!(Error);
 unsafe_no_jsmanaged_fields!(ServoUrl, ImmutableOrigin, MutableOrigin);
-unsafe_no_jsmanaged_fields!(Image, ImageMetadata, ImageCache, PendingImageId);
+unsafe_no_jsmanaged_fields!(Image, ImageMetadata, dyn ImageCache, PendingImageId);
 unsafe_no_jsmanaged_fields!(Metadata);
 unsafe_no_jsmanaged_fields!(NetworkError);
 unsafe_no_jsmanaged_fields!(Atom, Prefix, LocalName, Namespace, QualName);
@@ -461,7 +461,7 @@ unsafe_no_jsmanaged_fields!(AudioBuffer);
 unsafe_no_jsmanaged_fields!(AudioContext<Backend>);
 unsafe_no_jsmanaged_fields!(NodeId);
 unsafe_no_jsmanaged_fields!(AnalysisEngine, DistanceModel, PanningModel, ParamType);
-unsafe_no_jsmanaged_fields!(Player<Error = ServoMediaError>);
+unsafe_no_jsmanaged_fields!(dyn Player<Error = ServoMediaError>);
 unsafe_no_jsmanaged_fields!(Mutex<MediaFrameRenderer>);
 unsafe_no_jsmanaged_fields!(RenderApiSender);
 
@@ -497,7 +497,7 @@ where
 }
 
 // Safe thanks to the Send bound.
-unsafe impl JSTraceable for Box<LayoutRPC + Send + 'static> {
+unsafe impl JSTraceable for Box<dyn LayoutRPC + Send + 'static> {
     #[inline]
     unsafe fn trace(&self, _: *mut JSTracer) {
         // Do nothing
@@ -733,7 +733,7 @@ where
 
 /// Holds a set of JSTraceables that need to be rooted
 struct RootedTraceableSet {
-    set: Vec<*const JSTraceable>,
+    set: Vec<*const dyn JSTraceable>,
 }
 
 thread_local!(/// TLV Holds a set of JSTraceables that need to be rooted
@@ -744,7 +744,7 @@ impl RootedTraceableSet {
         RootedTraceableSet { set: vec![] }
     }
 
-    unsafe fn remove(traceable: *const JSTraceable) {
+    unsafe fn remove(traceable: *const dyn JSTraceable) {
         ROOTED_TRACEABLES.with(|ref traceables| {
             let mut traceables = traceables.borrow_mut();
             let idx = match traceables.set.iter().rposition(|x| *x == traceable) {
@@ -755,7 +755,7 @@ impl RootedTraceableSet {
         });
     }
 
-    unsafe fn add(traceable: *const JSTraceable) {
+    unsafe fn add(traceable: *const dyn JSTraceable) {
         ROOTED_TRACEABLES.with(|ref traceables| {
             traceables.borrow_mut().set.push(traceable);
         })
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 177239537ba..e2591566cee 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -13,7 +13,6 @@ use crate::dom::bindings::inheritance::TopTypeId;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::trace::trace_object;
 use crate::dom::windowproxy;
-use js;
 use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper};
 use js::glue::{GetCrossCompartmentWrapper, JS_GetReservedSlot, WrapperNew};
 use js::glue::{UnwrapObject, RUST_JSID_TO_INT, RUST_JSID_TO_STRING};
@@ -38,7 +37,6 @@ use js::rust::wrappers::JS_SetProperty;
 use js::rust::{get_object_class, is_dom_class, GCMethods, ToString, ToWindowProxyIfWindow};
 use js::rust::{Handle, HandleId, HandleObject, HandleValue, MutableHandleValue};
 use js::JS_CALLEE;
-use libc;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use std::ffi::CString;
 use std::os::raw::{c_char, c_void};
diff --git a/components/script/dom/bindings/weakref.rs b/components/script/dom/bindings/weakref.rs
index 6e46d0268df..2a9e176af6e 100644
--- a/components/script/dom/bindings/weakref.rs
+++ b/components/script/dom/bindings/weakref.rs
@@ -269,7 +269,7 @@ impl<T: WeakReferenceable> DerefMut for WeakRefVec<T> {
 /// An entry of a vector of weak references. Passed to the closure
 /// given to `WeakRefVec::update`.
 #[allow_unrooted_interior]
-pub struct WeakRefEntry<'a, T: WeakReferenceable + 'a> {
+pub struct WeakRefEntry<'a, T: WeakReferenceable> {
     vec: &'a mut WeakRefVec<T>,
     index: &'a mut usize,
 }