diff options
author | bors-servo <servo-ops@mozilla.com> | 2021-11-01 10:19:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 10:19:52 -0400 |
commit | 9693111c9744407730d7fc971a33800a831d575e (patch) | |
tree | 1cab74ab2e5930190ad0febc9cca870cc986f0e5 /components/script | |
parent | 6734eab188b5264b8d0b11686f332d88205e8d1f (diff) | |
parent | 01681e79c47ebfc45eaca18b79846e4fbe16a959 (diff) | |
download | servo-9693111c9744407730d7fc971a33800a831d575e.tar.gz servo-9693111c9744407730d7fc971a33800a831d575e.zip |
Auto merge of #28591 - servo:jdm-patch-51, r=jdm
Update rustc to latest nightly.
None
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/htmlanchorelement.rs | 2 | ||||
-rwxr-xr-x | components/script/dom/htmlinputelement.rs | 6 | ||||
-rw-r--r-- | components/script/dom/htmlmediaelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/node.rs | 4 | ||||
-rw-r--r-- | components/script/dom/treewalker.rs | 6 | ||||
-rw-r--r-- | components/script/dom/url.rs | 2 | ||||
-rw-r--r-- | components/script/dom/webgl_validations/tex_image_2d.rs | 2 | ||||
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index e6583329880..bd9a526cd16 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -427,7 +427,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement { if url.host().is_none() || url.cannot_be_a_base() || url.scheme() == "file" => { return; - } + }, None => return, // Step 4. Some(url) => { diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index aefbea6f30e..c5ce47e2249 100755 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -695,13 +695,13 @@ impl HTMLInputElement { { let intervals_from_base = ((value - step_base) / allowed_value_step).floor(); intervals_from_base * allowed_value_step + step_base - } + }, StepDirection::Up => // step up a fractional step to be on a step multiple { let intervals_from_base = ((value - step_base) / allowed_value_step).ceil(); intervals_from_base * allowed_value_step + step_base - } + }, }; } else { value = value + @@ -2371,7 +2371,7 @@ impl VirtualMethods for HTMLInputElement { { self.SetValue(DOMString::from("")) .expect("Failed to set input value on type change to ValueMode::Filename."); - } + }, _ => {}, } diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 27af41c2b0e..fcb38aa1427 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -209,7 +209,7 @@ impl VideoFrameRenderer for MediaFrameRenderer { if let Some(old_image_key) = self.old_frame.take() { updates.push(ImageUpdate::DeleteImage(old_image_key)); } - } + }, Some((ref mut image_key, ref mut width, ref mut height)) => { self.old_frame = Some(*image_key); diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 62f340fb215..7f8a0b87bcc 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2893,13 +2893,13 @@ impl NodeMethods for Node { if !is_equal_processinginstruction(this, node) => { return false; - } + }, NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) | NodeTypeId::CharacterData(CharacterDataTypeId::Comment) if !is_equal_characterdata(this, node) => { return false; - } + }, // Step 4. NodeTypeId::Element(..) if !is_equal_element_attrs(this, node) => return false, NodeTypeId::Attr if !is_equal_attr(this, node) => return false, diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index 86aa97466a7..2cd8de9fdb3 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -187,7 +187,7 @@ impl TreeWalkerMethods for TreeWalker { // outside of the tree rooted at the original root. { return Ok(None); - } + }, Some(n) => node = n, } // "5. Filter node and if the return value is FILTER_ACCEPT, then @@ -319,7 +319,7 @@ impl TreeWalker { if self.is_root_node(&parent) || self.is_current_node(&parent) => { return Ok(None); - } + }, // "5. Otherwise, set node to parent." Some(parent) => node = parent, } @@ -467,7 +467,7 @@ impl<'a> Iterator for &'a TreeWalker { // which cannot produce an Err result. { unreachable!() - } + }, } } } diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index 056f6aa9643..ab235816f4c 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -92,7 +92,7 @@ impl URL { return Err(Error::Type(format!("could not parse base: {}", error))); }, } - } + }, }; // Step 3. let parsed_url = match ServoUrl::parse_with_base(parsed_base.as_ref(), &url.0) { diff --git a/components/script/dom/webgl_validations/tex_image_2d.rs b/components/script/dom/webgl_validations/tex_image_2d.rs index e162081f637..dece682d377 100644 --- a/components/script/dom/webgl_validations/tex_image_2d.rs +++ b/components/script/dom/webgl_validations/tex_image_2d.rs @@ -356,7 +356,7 @@ impl<'a> WebGLValidator for TexImage2DValidator<'a> { { context.webgl_error(InvalidOperation); return Err(TexImageValidationError::InvalidTypeForFormat); - } + }, TexDataType::UnsignedShort565 if format != TexFormat::RGB => { context.webgl_error(InvalidOperation); return Err(TexImageValidationError::InvalidTypeForFormat); diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 772e00982be..b6adac383b7 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -1412,7 +1412,7 @@ impl XMLHttpRequest { if has_no_child_nodes { return None; } - } + }, // Step 3 _ => { return None; |