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/stylesheet_loader.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/stylesheet_loader.rs')
-rw-r--r-- | components/script/stylesheet_loader.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index 6562dcf7c2a..e1a55b3a8ac 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -2,24 +2,25 @@ * 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 crate::document_loader::LoadType; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::refcounted::Trusted; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::document::Document; +use crate::dom::element::Element; +use crate::dom::eventtarget::EventTarget; +use crate::dom::htmlelement::HTMLElement; +use crate::dom::htmllinkelement::{RequestGenerationId, HTMLLinkElement}; +use crate::dom::node::{document_from_node, window_from_node}; +use crate::network_listener::{NetworkListener, PreInvoke}; +use crate::task_source::TaskSourceName; use cssparser::SourceLocation; -use document_loader::LoadType; -use dom::bindings::inheritance::Castable; -use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::DomObject; -use dom::document::Document; -use dom::element::Element; -use dom::eventtarget::EventTarget; -use dom::htmlelement::HTMLElement; -use dom::htmllinkelement::{RequestGenerationId, HTMLLinkElement}; -use dom::node::{document_from_node, window_from_node}; use encoding_rs::UTF_8; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use mime::{self, Mime}; use net_traits::{FetchResponseListener, FetchMetadata, FilteredMetadata, Metadata, NetworkError, ReferrerPolicy}; use net_traits::request::{CorsSettings, CredentialsMode, Destination, RequestInit, RequestMode}; -use network_listener::{NetworkListener, PreInvoke}; use parking_lot::RwLock; use servo_arc::Arc; use servo_url::ServoUrl; @@ -33,7 +34,6 @@ use style::stylesheets::{CssRules, ImportRule, Namespaces, Stylesheet, Styleshee use style::stylesheets::StylesheetLoader as StyleStylesheetLoader; use style::stylesheets::import_rule::ImportSheet; use style::values::CssUrl; -use task_source::TaskSourceName; pub trait StylesheetOwner { /// Returns whether this element was inserted by the parser (i.e., it should |