Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 16 insertions, 14 deletions

diff --git a/components/script/dom/cssconditionrule.rs b/components/script/dom/cssconditionrule.rs
index 8bf5dad6c93..86010eba4e9 100644
--- a/components/script/dom/cssconditionrule.rs
+++ b/components/script/dom/cssconditionrule.rs
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::CSSConditionRuleBinding::CSSConditionRuleMethods;
-use dom::bindings::inheritance::Castable;
-use dom::bindings::str::DOMString;
-use dom::cssgroupingrule::CSSGroupingRule;
-use dom::cssmediarule::CSSMediaRule;
-use dom::cssstylesheet::CSSStyleSheet;
-use dom::csssupportsrule::CSSSupportsRule;
+use crate::dom::bindings::codegen::Bindings::CSSConditionRuleBinding::CSSConditionRuleMethods;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::cssgroupingrule::CSSGroupingRule;
+use crate::dom::cssmediarule::CSSMediaRule;
+use crate::dom::cssstylesheet::CSSStyleSheet;
+use crate::dom::csssupportsrule::CSSSupportsRule;
 use dom_struct::dom_struct;
-use std::sync::Arc;
-use style::shared_lock::{SharedRwLock, Locked};
+use servo_arc::Arc;
+use style::shared_lock::{Locked, SharedRwLock};
 use style::stylesheets::CssRules as StyleCssRules;
 
 #[dom_struct]
@@ -20,8 +20,10 @@ pub struct CSSConditionRule {
 }
 
 impl CSSConditionRule {
-    pub fn new_inherited(parent_stylesheet: &CSSStyleSheet,
-                         rules: Arc<Locked<StyleCssRules>>) -> CSSConditionRule {
+    pub fn new_inherited(
+        parent_stylesheet: &CSSStyleSheet,
+        rules: Arc<Locked<StyleCssRules>>,
+    ) -> CSSConditionRule {
         CSSConditionRule {
             cssgroupingrule: CSSGroupingRule::new_inherited(parent_stylesheet, rules),
         }
@@ -37,7 +39,7 @@ impl CSSConditionRule {
 }
 
 impl CSSConditionRuleMethods for CSSConditionRule {
-    /// https://drafts.csswg.org/css-conditional-3/#dom-cssconditionrule-conditiontext
+    /// <https://drafts.csswg.org/css-conditional-3/#dom-cssconditionrule-conditiontext>
     fn ConditionText(&self) -> DOMString {
         if let Some(rule) = self.downcast::<CSSMediaRule>() {
             rule.get_condition_text()
@@ -48,7 +50,7 @@ impl CSSConditionRuleMethods for CSSConditionRule {
         }
     }
 
-    /// https://drafts.csswg.org/css-conditional-3/#dom-cssconditionrule-conditiontext
+    /// <https://drafts.csswg.org/css-conditional-3/#dom-cssconditionrule-conditiontext>
     fn SetConditionText(&self, text: DOMString) {
         if let Some(rule) = self.downcast::<CSSMediaRule>() {
             rule.set_condition_text(text)