diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 23:45:06 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-06 15:26:02 +0100 |
commit | 45f7199eee82c66637ec68287eafa40a651001c4 (patch) | |
tree | 8c0802f4ac7b89c2ce4d73063c8f65b9ee5face9 /components/script/dom/bindings | |
parent | 86f148fb97601413c0d983f21b760d973ade7a75 (diff) | |
download | servo-45f7199eee82c66637ec68287eafa40a651001c4.tar.gz servo-45f7199eee82c66637ec68287eafa40a651001c4.zip |
`cargo fix --edition`
Diffstat (limited to 'components/script/dom/bindings')
19 files changed, 172 insertions, 172 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index ddc11ce25da..4db1fdf22cd 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -4,12 +4,12 @@ //! Base classes to work with IDL callbacks. -use dom::bindings::error::{Error, Fallible, report_pending_exception}; -use dom::bindings::reflector::DomObject; -use dom::bindings::root::{Dom, DomRoot}; -use dom::bindings::settings_stack::{AutoEntryScript, AutoIncumbentScript}; -use dom::bindings::utils::AsCCharPtrPtr; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::error::{Error, Fallible, report_pending_exception}; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::settings_stack::{AutoEntryScript, AutoIncumbentScript}; +use crate::dom::bindings::utils::AsCCharPtrPtr; +use crate::dom::globalscope::GlobalScope; use js::jsapi::{IsCallable, JSContext, JSObject, AddRawValueRoot}; use js::jsapi::{JSCompartment, JS_EnterCompartment, JS_LeaveCompartment, RemoveRawValueRoot}; use js::jsapi::Heap; diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index 4f848ea97d7..aecaf0c1a04 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -32,14 +32,14 @@ //! | sequences | `Vec<T>` | | //! | union types | `T` | | -use dom::bindings::error::{Error, Fallible}; -use dom::bindings::inheritance::Castable; -use dom::bindings::num::Finite; -use dom::bindings::reflector::{DomObject, Reflector}; -use dom::bindings::root::DomRoot; -use dom::bindings::str::{ByteString, DOMString, USVString}; -use dom::bindings::trace::{JSTraceable, RootedTraceableBox}; -use dom::bindings::utils::DOMClass; +use crate::dom::bindings::error::{Error, Fallible}; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::num::Finite; +use crate::dom::bindings::reflector::{DomObject, Reflector}; +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; pub use js::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible}; pub use js::conversions::ConversionBehavior; @@ -65,7 +65,7 @@ use std::{char, ffi, ptr, slice}; /// A trait to check whether a given `JSObject` implements an IDL interface. pub trait IDLInterface { /// Returns whether the given DOM class derives that interface. - fn derives(&'static DOMClass) -> bool; + fn derives(_: &'static DOMClass) -> bool; } /// A trait to mark an IDL interface as deriving from another one. @@ -384,7 +384,7 @@ pub unsafe fn private_from_object(obj: *mut JSObject) -> *const libc::c_void { /// Get the `DOMClass` from `obj`, or `Err(())` if `obj` is not a DOM object. pub unsafe fn get_dom_class(obj: *mut JSObject) -> Result<&'static DOMClass, ()> { - use dom::bindings::utils::DOMJSClass; + use crate::dom::bindings::utils::DOMJSClass; use js::glue::GetProxyHandlerExtra; let clasp = get_object_class(obj); diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs index 64b581f316d..c2d0be39a44 100644 --- a/components/script/dom/bindings/error.rs +++ b/components/script/dom/bindings/error.rs @@ -8,13 +8,13 @@ use backtrace::Backtrace; #[cfg(feature = "js_backtrace")] use dom::bindings::cell::DomRefCell; -use dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods; -use dom::bindings::codegen::PrototypeList::proto_id_to_name; -use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible}; -use dom::bindings::conversions::root_from_object; -use dom::bindings::str::USVString; -use dom::domexception::{DOMErrorName, DOMException}; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods; +use crate::dom::bindings::codegen::PrototypeList::proto_id_to_name; +use crate::dom::bindings::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible}; +use crate::dom::bindings::conversions::root_from_object; +use crate::dom::bindings::str::USVString; +use crate::dom::domexception::{DOMErrorName, DOMException}; +use crate::dom::globalscope::GlobalScope; use js::error::{throw_range_error, throw_type_error}; use js::jsapi::JSContext; use js::jsapi::JS_ClearPendingException; diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs index c8f7e63358e..282c9e556a1 100644 --- a/components/script/dom/bindings/htmlconstructor.rs +++ b/components/script/dom/bindings/htmlconstructor.rs @@ -2,80 +2,80 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::codegen::Bindings::HTMLAnchorElementBinding; -use dom::bindings::codegen::Bindings::HTMLAreaElementBinding; -use dom::bindings::codegen::Bindings::HTMLAudioElementBinding; -use dom::bindings::codegen::Bindings::HTMLBRElementBinding; -use dom::bindings::codegen::Bindings::HTMLBaseElementBinding; -use dom::bindings::codegen::Bindings::HTMLBodyElementBinding; -use dom::bindings::codegen::Bindings::HTMLButtonElementBinding; -use dom::bindings::codegen::Bindings::HTMLCanvasElementBinding; -use dom::bindings::codegen::Bindings::HTMLDListElementBinding; -use dom::bindings::codegen::Bindings::HTMLDataElementBinding; -use dom::bindings::codegen::Bindings::HTMLDataListElementBinding; -use dom::bindings::codegen::Bindings::HTMLDetailsElementBinding; -use dom::bindings::codegen::Bindings::HTMLDialogElementBinding; -use dom::bindings::codegen::Bindings::HTMLDirectoryElementBinding; -use dom::bindings::codegen::Bindings::HTMLDivElementBinding; -use dom::bindings::codegen::Bindings::HTMLElementBinding; -use dom::bindings::codegen::Bindings::HTMLEmbedElementBinding; -use dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding; -use dom::bindings::codegen::Bindings::HTMLFontElementBinding; -use dom::bindings::codegen::Bindings::HTMLFormElementBinding; -use dom::bindings::codegen::Bindings::HTMLFrameElementBinding; -use dom::bindings::codegen::Bindings::HTMLFrameSetElementBinding; -use dom::bindings::codegen::Bindings::HTMLHRElementBinding; -use dom::bindings::codegen::Bindings::HTMLHeadElementBinding; -use dom::bindings::codegen::Bindings::HTMLHeadingElementBinding; -use dom::bindings::codegen::Bindings::HTMLHtmlElementBinding; -use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; -use dom::bindings::codegen::Bindings::HTMLImageElementBinding; -use dom::bindings::codegen::Bindings::HTMLInputElementBinding; -use dom::bindings::codegen::Bindings::HTMLLIElementBinding; -use dom::bindings::codegen::Bindings::HTMLLabelElementBinding; -use dom::bindings::codegen::Bindings::HTMLLegendElementBinding; -use dom::bindings::codegen::Bindings::HTMLLinkElementBinding; -use dom::bindings::codegen::Bindings::HTMLMapElementBinding; -use dom::bindings::codegen::Bindings::HTMLMetaElementBinding; -use dom::bindings::codegen::Bindings::HTMLMeterElementBinding; -use dom::bindings::codegen::Bindings::HTMLModElementBinding; -use dom::bindings::codegen::Bindings::HTMLOListElementBinding; -use dom::bindings::codegen::Bindings::HTMLObjectElementBinding; -use dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding; -use dom::bindings::codegen::Bindings::HTMLOptionElementBinding; -use dom::bindings::codegen::Bindings::HTMLOutputElementBinding; -use dom::bindings::codegen::Bindings::HTMLParagraphElementBinding; -use dom::bindings::codegen::Bindings::HTMLParamElementBinding; -use dom::bindings::codegen::Bindings::HTMLPreElementBinding; -use dom::bindings::codegen::Bindings::HTMLProgressElementBinding; -use dom::bindings::codegen::Bindings::HTMLQuoteElementBinding; -use dom::bindings::codegen::Bindings::HTMLScriptElementBinding; -use dom::bindings::codegen::Bindings::HTMLSelectElementBinding; -use dom::bindings::codegen::Bindings::HTMLSourceElementBinding; -use dom::bindings::codegen::Bindings::HTMLSpanElementBinding; -use dom::bindings::codegen::Bindings::HTMLStyleElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableCaptionElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableColElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableRowElementBinding; -use dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding; -use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding; -use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding; -use dom::bindings::codegen::Bindings::HTMLTimeElementBinding; -use dom::bindings::codegen::Bindings::HTMLTitleElementBinding; -use dom::bindings::codegen::Bindings::HTMLTrackElementBinding; -use dom::bindings::codegen::Bindings::HTMLUListElementBinding; -use dom::bindings::codegen::Bindings::HTMLVideoElementBinding; -use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::conversions::DerivedFrom; -use dom::bindings::error::{Error, Fallible}; -use dom::bindings::root::DomRoot; -use dom::create::create_native_html_element; -use dom::customelementregistry::ConstructionStackEntry; -use dom::element::{CustomElementState, Element, ElementCreator}; -use dom::htmlelement::HTMLElement; -use dom::window::Window; +use crate::dom::bindings::codegen::Bindings::HTMLAnchorElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLAreaElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLAudioElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLBRElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLBaseElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLBodyElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLButtonElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLCanvasElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDListElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDataElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDataListElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDetailsElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDialogElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDirectoryElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLDivElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLEmbedElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLFontElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLFormElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLFrameElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLFrameSetElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLHRElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLHeadElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLHeadingElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLHtmlElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLIFrameElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLImageElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLInputElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLLIElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLLabelElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLLegendElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLLinkElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLMapElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLMetaElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLMeterElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLModElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLOListElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLObjectElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLOptionElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLOutputElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLParagraphElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLParamElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLPreElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLProgressElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLQuoteElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLScriptElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLSelectElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLSourceElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLSpanElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLStyleElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableCaptionElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableCellElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableColElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableRowElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTableSectionElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTemplateElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTimeElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTitleElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLTrackElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLUListElementBinding; +use crate::dom::bindings::codegen::Bindings::HTMLVideoElementBinding; +use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; +use crate::dom::bindings::conversions::DerivedFrom; +use crate::dom::bindings::error::{Error, Fallible}; +use crate::dom::bindings::root::DomRoot; +use crate::dom::create::create_native_html_element; +use crate::dom::customelementregistry::ConstructionStackEntry; +use crate::dom::element::{CustomElementState, Element, ElementCreator}; +use crate::dom::htmlelement::HTMLElement; +use crate::dom::window::Window; use html5ever::LocalName; use html5ever::interface::QualName; use js::glue::UnwrapObject; @@ -83,7 +83,7 @@ use js::jsapi::{CallArgs, CurrentGlobalOrNull}; use js::jsapi::{JSAutoCompartment, JSContext, JSObject}; use js::rust::HandleObject; use js::rust::MutableHandleObject; -use script_thread::ScriptThread; +use crate::script_thread::ScriptThread; use std::ptr; // https://html.spec.whatwg.org/multipage/#htmlconstructor diff --git a/components/script/dom/bindings/inheritance.rs b/components/script/dom/bindings/inheritance.rs index eaf394e594d..5e535a0a0ba 100644 --- a/components/script/dom/bindings/inheritance.rs +++ b/components/script/dom/bindings/inheritance.rs @@ -4,11 +4,11 @@ //! The `Castable` trait. -pub use dom::bindings::codegen::InheritTypes::*; +pub use crate::dom::bindings::codegen::InheritTypes::*; -use dom::bindings::conversions::{DerivedFrom, IDLInterface}; -use dom::bindings::conversions::get_dom_class; -use dom::bindings::reflector::DomObject; +use crate::dom::bindings::conversions::{DerivedFrom, IDLInterface}; +use crate::dom::bindings::conversions::get_dom_class; +use crate::dom::bindings::reflector::DomObject; use std::mem; /// A trait to hold the cast functions of IDL interfaces that either derive diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index 210e9ae5576..e390eb54742 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -4,12 +4,12 @@ //! Machinery to initialise interface prototype objects and interface objects. -use dom::bindings::codegen::InterfaceObjectMap::Globals; -use dom::bindings::codegen::PrototypeList; -use dom::bindings::constant::{define_constants, ConstantSpec}; -use dom::bindings::conversions::{get_dom_class, DOM_OBJECT_SLOT}; -use dom::bindings::guard::Guard; -use dom::bindings::utils::{get_proto_or_iface_array, ProtoOrIfaceArray, DOM_PROTOTYPE_SLOT}; +use crate::dom::bindings::codegen::InterfaceObjectMap::Globals; +use crate::dom::bindings::codegen::PrototypeList; +use crate::dom::bindings::constant::{define_constants, ConstantSpec}; +use crate::dom::bindings::conversions::{get_dom_class, DOM_OBJECT_SLOT}; +use crate::dom::bindings::guard::Guard; +use crate::dom::bindings::utils::{get_proto_or_iface_array, ProtoOrIfaceArray, DOM_PROTOTYPE_SLOT}; use js::error::throw_type_error; use js::glue::{UncheckedUnwrapObject, RUST_SYMBOL_TO_JSID}; use js::jsapi::{Class, ClassOps, CompartmentOptions}; diff --git a/components/script/dom/bindings/iterable.rs b/components/script/dom/bindings/iterable.rs index 488714d3d0b..c8b6caf5f42 100644 --- a/components/script/dom/bindings/iterable.rs +++ b/components/script/dom/bindings/iterable.rs @@ -6,13 +6,13 @@ //! Implementation of `iterable<...>` and `iterable<..., ...>` WebIDL declarations. -use dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyAndValueResult; -use dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyOrValueResult; -use dom::bindings::error::Fallible; -use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; -use dom::bindings::root::{Dom, DomRoot}; -use dom::bindings::trace::{JSTraceable, RootedTraceableBox}; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyAndValueResult; +use crate::dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyOrValueResult; +use crate::dom::bindings::error::Fallible; +use crate::dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::trace::{JSTraceable, RootedTraceableBox}; +use crate::dom::globalscope::GlobalScope; use dom_struct::dom_struct; use js::conversions::ToJSValConvertible; use js::jsapi::{Heap, JSContext, JSObject}; diff --git a/components/script/dom/bindings/mozmap.rs b/components/script/dom/bindings/mozmap.rs index 68ea9fa382d..5c0451cca71 100644 --- a/components/script/dom/bindings/mozmap.rs +++ b/components/script/dom/bindings/mozmap.rs @@ -4,9 +4,9 @@ //! The `MozMap` (open-ended dictionary) type. -use dom::bindings::conversions::jsid_to_string; -use dom::bindings::error::report_pending_exception; -use dom::bindings::str::DOMString; +use crate::dom::bindings::conversions::jsid_to_string; +use crate::dom::bindings::error::report_pending_exception; +use crate::dom::bindings::str::DOMString; use js::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible}; use js::jsapi::JSContext; use js::jsapi::JSITER_HIDDEN; diff --git a/components/script/dom/bindings/namespace.rs b/components/script/dom/bindings/namespace.rs index 64b67b33e1e..505a5335830 100644 --- a/components/script/dom/bindings/namespace.rs +++ b/components/script/dom/bindings/namespace.rs @@ -4,8 +4,8 @@ //! Machinery to initialise namespace objects. -use dom::bindings::guard::Guard; -use dom::bindings::interface::{create_object, define_on_global_object}; +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; diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index 86b7d81667c..924696ecb26 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -6,8 +6,8 @@ #![deny(missing_docs)] -use dom::bindings::conversions::is_dom_proxy; -use dom::bindings::utils::delete_property_by_id; +use crate::dom::bindings::conversions::is_dom_proxy; +use crate::dom::bindings::utils::delete_property_by_id; use js::glue::{GetProxyHandler, GetProxyHandlerFamily}; use js::glue::{GetProxyPrivate, SetProxyPrivate}; use js::glue::InvokeGetOwnPropertyDescriptor; diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs index 49add72e114..f74fba6355f 100644 --- a/components/script/dom/bindings/refcounted.rs +++ b/components/script/dom/bindings/refcounted.rs @@ -22,12 +22,12 @@ //! its hash table during the next GC. During GC, the entries of the hash table are counted //! as JS roots. -use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::error::Error; -use dom::bindings::reflector::{DomObject, Reflector}; -use dom::bindings::root::DomRoot; -use dom::bindings::trace::trace_reflector; -use dom::promise::Promise; +use crate::dom::bindings::conversions::ToJSValConvertible; +use crate::dom::bindings::error::Error; +use crate::dom::bindings::reflector::{DomObject, Reflector}; +use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::trace::trace_reflector; +use crate::dom::promise::Promise; use js::jsapi::JSTracer; use libc; use std::cell::RefCell; @@ -37,7 +37,7 @@ use std::hash::Hash; use std::marker::PhantomData; use std::rc::Rc; use std::sync::{Arc, Weak}; -use task::TaskOnce; +use crate::task::TaskOnce; #[allow(missing_docs)] // FIXME mod dummy { diff --git a/components/script/dom/bindings/reflector.rs b/components/script/dom/bindings/reflector.rs index 2bf1983d40e..a86f502e235 100644 --- a/components/script/dom/bindings/reflector.rs +++ b/components/script/dom/bindings/reflector.rs @@ -4,9 +4,9 @@ //! The `Reflector` struct. -use dom::bindings::conversions::DerivedFrom; -use dom::bindings::root::DomRoot; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::conversions::DerivedFrom; +use crate::dom::bindings::root::DomRoot; +use crate::dom::globalscope::GlobalScope; use js::jsapi::{JSContext, JSObject, Heap}; use js::rust::HandleObject; use std::default::Default; diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs index d974e75737c..8c4a528b67a 100644 --- a/components/script/dom/bindings/root.rs +++ b/components/script/dom/bindings/root.rs @@ -24,12 +24,12 @@ //! originating `DomRoot<T>`. //! -use dom::bindings::conversions::DerivedFrom; -use dom::bindings::inheritance::Castable; -use dom::bindings::reflector::{DomObject, Reflector}; -use dom::bindings::trace::JSTraceable; -use dom::bindings::trace::trace_reflector; -use dom::node::Node; +use crate::dom::bindings::conversions::DerivedFrom; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::reflector::{DomObject, Reflector}; +use crate::dom::bindings::trace::JSTraceable; +use crate::dom::bindings::trace::trace_reflector; +use crate::dom::node::Node; use js::jsapi::{JSObject, JSTracer, Heap}; use js::rust::GCMethods; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; diff --git a/components/script/dom/bindings/settings_stack.rs b/components/script/dom/bindings/settings_stack.rs index e5efea05e98..da26bff3db7 100644 --- a/components/script/dom/bindings/settings_stack.rs +++ b/components/script/dom/bindings/settings_stack.rs @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::bindings::root::{Dom, DomRoot}; -use dom::bindings::trace::JSTraceable; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::trace::JSTraceable; +use crate::dom::globalscope::GlobalScope; use js::jsapi::GetScriptedCallerGlobal; use js::jsapi::HideScriptedCaller; use js::jsapi::JSTracer; diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index c4a68547247..094749ff875 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -5,12 +5,12 @@ //! This module implements structured cloning, as defined by [HTML] //! (https://html.spec.whatwg.org/multipage/#safe-passing-of-structured-data). -use dom::bindings::conversions::root_from_handleobject; -use dom::bindings::error::{Error, Fallible}; -use dom::bindings::reflector::DomObject; -use dom::bindings::root::DomRoot; -use dom::blob::{Blob, BlobImpl}; -use dom::globalscope::GlobalScope; +use crate::dom::bindings::conversions::root_from_handleobject; +use crate::dom::bindings::error::{Error, Fallible}; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::root::DomRoot; +use crate::dom::blob::{Blob, BlobImpl}; +use crate::dom::globalscope::GlobalScope; use js::glue::CopyJSStructuredCloneData; use js::glue::DeleteJSAutoStructuredCloneBuffer; use js::glue::GetLengthOfJSStructuredCloneData; diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 75fcfb42c16..e6758dacaf2 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -39,16 +39,16 @@ use canvas_traits::webgl::{WebGLSLVersion, WebGLSender, WebGLShaderId, WebGLText use canvas_traits::webgl::{WebGLVersion, WebGLVertexArrayId}; use cssparser::RGBA; use devtools_traits::{CSSError, TimelineMarkerType, WorkerId}; -use dom::bindings::cell::DomRefCell; -use dom::bindings::error::Error; -use dom::bindings::refcounted::{Trusted, TrustedPromise}; -use dom::bindings::reflector::{DomObject, Reflector}; -use dom::bindings::root::{Dom, DomRoot}; -use dom::bindings::str::{DOMString, USVString}; -use dom::bindings::utils::WindowProxyHandler; -use dom::document::PendingRestyle; -use dom::htmlimageelement::SourceSet; -use dom::htmlmediaelement::MediaFrameRenderer; +use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::error::Error; +use crate::dom::bindings::refcounted::{Trusted, TrustedPromise}; +use crate::dom::bindings::reflector::{DomObject, Reflector}; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::str::{DOMString, USVString}; +use crate::dom::bindings::utils::WindowProxyHandler; +use crate::dom::document::PendingRestyle; +use crate::dom::htmlimageelement::SourceSet; +use crate::dom::htmlmediaelement::MediaFrameRenderer; use encoding_rs::{Decoder, Encoding}; use euclid::{Transform2D, Transform3D, Point2D, Vector2D, Rect, TypedSize2D, TypedScale}; use euclid::Length as EuclidLength; diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 7366401af51..8579103afd5 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -4,15 +4,15 @@ //! Various utilities to glue JavaScript and the DOM implementation together. -use dom::bindings::codegen::InterfaceObjectMap; -use dom::bindings::codegen::PrototypeList; -use dom::bindings::codegen::PrototypeList::{MAX_PROTO_CHAIN_LENGTH, PROTO_OR_IFACE_LENGTH}; -use dom::bindings::conversions::{jsstring_to_str, private_from_proto_check}; -use dom::bindings::error::throw_invalid_this; -use dom::bindings::inheritance::TopTypeId; -use dom::bindings::str::DOMString; -use dom::bindings::trace::trace_object; -use dom::windowproxy; +use crate::dom::bindings::codegen::InterfaceObjectMap; +use crate::dom::bindings::codegen::PrototypeList; +use crate::dom::bindings::codegen::PrototypeList::{MAX_PROTO_CHAIN_LENGTH, PROTO_OR_IFACE_LENGTH}; +use crate::dom::bindings::conversions::{jsstring_to_str, private_from_proto_check}; +use crate::dom::bindings::error::throw_invalid_this; +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::JS_CALLEE; use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper}; diff --git a/components/script/dom/bindings/weakref.rs b/components/script/dom/bindings/weakref.rs index aed0d9ec6f8..6e46d0268df 100644 --- a/components/script/dom/bindings/weakref.rs +++ b/components/script/dom/bindings/weakref.rs @@ -11,10 +11,10 @@ //! slot. When all associated `WeakRef` values are dropped, the //! `WeakBox` itself is dropped too. -use dom::bindings::cell::DomRefCell; -use dom::bindings::reflector::DomObject; -use dom::bindings::root::DomRoot; -use dom::bindings::trace::JSTraceable; +use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::trace::JSTraceable; use js::glue::JS_GetReservedSlot; use js::jsapi::{JSTracer, JS_SetReservedSlot}; use js::jsval::PrivateValue; diff --git a/components/script/dom/bindings/xmlname.rs b/components/script/dom/bindings/xmlname.rs index 2a2b8a462a0..d547355e423 100644 --- a/components/script/dom/bindings/xmlname.rs +++ b/components/script/dom/bindings/xmlname.rs @@ -4,8 +4,8 @@ //! Functions for validating and extracting qualified XML names. -use dom::bindings::error::{Error, ErrorResult, Fallible}; -use dom::bindings::str::DOMString; +use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; +use crate::dom::bindings::str::DOMString; use html5ever::{Prefix, LocalName, Namespace}; /// Validate a qualified name. See https://dom.spec.whatwg.org/#validate for details. |