diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-06 13:38:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-06 13:38:52 -0500 |
commit | 6878dbbbeaa59b21a7b3608b6d6a911e88c1e443 (patch) | |
tree | f4a13f7d59c7f72c51e30755d1097595764f96c0 /components/script/dom/htmlmediaelement.rs | |
parent | 8df38f5e29d0005b792d403c3c54d35748448100 (diff) | |
parent | 8757cf5bc084ee23db643e283ca7e9fef143d810 (diff) | |
download | servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.tar.gz servo-6878dbbbeaa59b21a7b3608b6d6a911e88c1e443.zip |
Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin
Switch some crates to the 2018 edition
This is the subset of https://github.com/servo/servo/pull/22083 that doesn’t affect Gecko at all, so it isn’t blocked.
<!-- 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/22086)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlmediaelement.rs')
-rw-r--r-- | components/script/dom/htmlmediaelement.rs | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 1cd0b5e825a..010795a0b80 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -2,52 +2,53 @@ * 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 document_loader::{LoadBlocker, LoadType}; -use dom::attr::Attr; -use dom::bindings::cell::DomRefCell; -use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; -use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::CanPlayTypeResult; -use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants; -use dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; -use dom::bindings::codegen::Bindings::HTMLSourceElementBinding::HTMLSourceElementMethods; -use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*; -use dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorMethods; -use dom::bindings::codegen::InheritTypes::{ElementTypeId, HTMLElementTypeId}; -use dom::bindings::codegen::InheritTypes::{HTMLMediaElementTypeId, NodeTypeId}; -use dom::bindings::error::{Error, ErrorResult}; -use dom::bindings::inheritance::Castable; -use dom::bindings::num::Finite; -use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::DomObject; -use dom::bindings::root::{DomRoot, LayoutDom, MutNullableDom}; -use dom::bindings::str::DOMString; -use dom::blob::Blob; -use dom::document::Document; -use dom::element::{Element, AttributeMutation}; -use dom::eventtarget::EventTarget; -use dom::htmlelement::HTMLElement; -use dom::htmlsourceelement::HTMLSourceElement; -use dom::htmlvideoelement::HTMLVideoElement; -use dom::mediaerror::MediaError; -use dom::node::{document_from_node, window_from_node, Node, NodeDamage, UnbindContext}; -use dom::promise::Promise; -use dom::virtualmethods::VirtualMethods; +use crate::document_loader::{LoadBlocker, LoadType}; +use crate::dom::attr::Attr; +use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::codegen::Bindings::AttrBinding::AttrMethods; +use crate::dom::bindings::codegen::Bindings::HTMLMediaElementBinding::CanPlayTypeResult; +use crate::dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementConstants; +use crate::dom::bindings::codegen::Bindings::HTMLMediaElementBinding::HTMLMediaElementMethods; +use crate::dom::bindings::codegen::Bindings::HTMLSourceElementBinding::HTMLSourceElementMethods; +use crate::dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorConstants::*; +use crate::dom::bindings::codegen::Bindings::MediaErrorBinding::MediaErrorMethods; +use crate::dom::bindings::codegen::InheritTypes::{ElementTypeId, HTMLElementTypeId}; +use crate::dom::bindings::codegen::InheritTypes::{HTMLMediaElementTypeId, NodeTypeId}; +use crate::dom::bindings::error::{Error, ErrorResult}; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::num::Finite; +use crate::dom::bindings::refcounted::Trusted; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::root::{DomRoot, LayoutDom, MutNullableDom}; +use crate::dom::bindings::str::DOMString; +use crate::dom::blob::Blob; +use crate::dom::document::Document; +use crate::dom::element::{Element, AttributeMutation}; +use crate::dom::eventtarget::EventTarget; +use crate::dom::htmlelement::HTMLElement; +use crate::dom::htmlsourceelement::HTMLSourceElement; +use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::mediaerror::MediaError; +use crate::dom::node::{document_from_node, window_from_node, Node, NodeDamage, UnbindContext}; +use crate::dom::promise::Promise; +use crate::dom::virtualmethods::VirtualMethods; +use crate::fetch::FetchCanceller; +use crate::microtask::{Microtask, MicrotaskRunnable}; +use crate::network_listener::{NetworkListener, PreInvoke}; +use crate::script_thread::ScriptThread; +use crate::task_source::{TaskSource, TaskSourceName}; use dom_struct::dom_struct; -use fetch::FetchCanceller; use headers_core::HeaderMapExt; use headers_ext::ContentLength; use html5ever::{LocalName, Prefix}; use http::header::{self, HeaderMap, HeaderValue}; use ipc_channel::ipc; use ipc_channel::router::ROUTER; -use microtask::{Microtask, MicrotaskRunnable}; use mime::{self, Mime}; use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseListener, FetchMetadata, Metadata}; use net_traits::NetworkError; use net_traits::request::{CredentialsMode, Destination, RequestInit}; -use network_listener::{NetworkListener, PreInvoke}; use script_layout_interface::HTMLMediaData; -use script_thread::ScriptThread; use servo_media::Error as ServoMediaError; use servo_media::ServoMedia; use servo_media::player::{PlaybackState, Player, PlayerEvent, StreamType}; @@ -59,7 +60,6 @@ use std::f64; use std::mem; use std::rc::Rc; use std::sync::{Arc, Mutex}; -use task_source::{TaskSource, TaskSourceName}; use time::{self, Timespec, Duration}; use webrender_api::{ImageData, ImageDescriptor, ImageFormat, ImageKey, RenderApi}; use webrender_api::{RenderApiSender, Transaction}; |