Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clippy: Fixed warnings in htmlimageelement.rs (#31800)

Browse source 
* Fixed warnings in htmlimageelement.rs

* making changes for test-tidy to run without errors.
This commit is contained in:
Aarya Khandelwal 2024-03-21 13:30:24 +05:30 • committed by GitHub
parent da3288dd00
commit 7cdff9dd06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/htmliframeelement.rs
View file

@ -696,10 +696,10 @@ impl VirtualMethods for HTMLIFrameElement {
} }
fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue { fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
match name { match *name {
&local_name!("sandbox") => AttrValue::from_serialized_tokenlist(value.into()), local_name!("sandbox") => AttrValue::from_serialized_tokenlist(value.into()),
&local_name!("width") => AttrValue::from_dimension(value.into()), local_name!("width") => AttrValue::from_dimension(value.into()),
&local_name!("height") => AttrValue::from_dimension(value.into()), local_name!("height") => AttrValue::from_dimension(value.into()),
_ => self _ => self
.super_type() .super_type()
.unwrap() .unwrap()
@ -708,7 +708,7 @@ impl VirtualMethods for HTMLIFrameElement {
} }
fn bind_to_tree(&self, context: &BindContext) { fn bind_to_tree(&self, context: &BindContext) {
if let Some(ref s) = self.super_type() { if let Some(s) = self.super_type() {
s.bind_to_tree(context); s.bind_to_tree(context);
} }

34
components/script/dom/htmlimageelement.rs
View file

@ -545,10 +545,10 @@ impl HTMLImageElement {
.map(|n| DomRoot::from_ref(&*n)) .map(|n| DomRoot::from_ref(&*n))
.collect() .collect()
} else { } else {
vec![DomRoot::from_ref(&*elem)] vec![DomRoot::from_ref(elem)]
} }
}, },
None => vec![DomRoot::from_ref(&*elem)], None => vec![DomRoot::from_ref(elem)],
}; };
// Step 3 // Step 3
@ -566,7 +566,7 @@ impl HTMLImageElement {
// Step 4 // Step 4
for element in &elements { for element in &elements {
// Step 4.1 // Step 4.1
if *element == DomRoot::from_ref(&*elem) { if *element == DomRoot::from_ref(elem) {
let mut source_set = SourceSet::new(); let mut source_set = SourceSet::new();
// Step 4.1.1 // Step 4.1.1
if let Some(x) = element.get_attribute(&ns!(), &local_name!("srcset")) { if let Some(x) = element.get_attribute(&ns!(), &local_name!("srcset")) {
@ -780,7 +780,7 @@ impl HTMLImageElement {
let selected_source = img_sources.remove(best_candidate.1).clone(); let selected_source = img_sources.remove(best_candidate.1).clone();
Some(( Some((
USVString(selected_source.url), USVString(selected_source.url),
selected_source.descriptor.den.unwrap() as f64, selected_source.descriptor.den.unwrap(),
)) ))
} }
@ -796,7 +796,7 @@ impl HTMLImageElement {
request.metadata = None; request.metadata = None;
let document = document_from_node(self); let document = document_from_node(self);
LoadBlocker::terminate(&mut request.blocker); LoadBlocker::terminate(&mut request.blocker);
request.blocker = Some(LoadBlocker::new(&*document, LoadType::Image(url.clone()))); request.blocker = Some(LoadBlocker::new(&document, LoadType::Image(url.clone())));
} }
/// Step 13-17 of html.spec.whatwg.org/multipage/#update-the-image-data /// Step 13-17 of html.spec.whatwg.org/multipage/#update-the-image-data
@ -827,23 +827,23 @@ impl HTMLImageElement {
} }
pending_request.current_pixel_density = Some(selected_pixel_density); pending_request.current_pixel_density = Some(selected_pixel_density);
self.image_request.set(ImageRequestPhase::Pending); self.image_request.set(ImageRequestPhase::Pending);
self.init_image_request(&mut pending_request, &url, &src); self.init_image_request(&mut pending_request, url, src);
}, },
(_, State::Broken) | (_, State::Unavailable) => { (_, State::Broken) | (_, State::Unavailable) => {
// Step 17 // Step 17
current_request.current_pixel_density = Some(selected_pixel_density); current_request.current_pixel_density = Some(selected_pixel_density);
self.init_image_request(&mut current_request, &url, &src); self.init_image_request(&mut current_request, url, src);
}, },
(_, _) => { (_, _) => {
// step 17 // step 17
pending_request.current_pixel_density = Some(selected_pixel_density); pending_request.current_pixel_density = Some(selected_pixel_density);
self.image_request.set(ImageRequestPhase::Pending); self.image_request.set(ImageRequestPhase::Pending);
self.init_image_request(&mut pending_request, &url, &src); self.init_image_request(&mut pending_request, url, src);
}, },
} }
}, },
} }
self.fetch_image(&url); self.fetch_image(url);
} }
/// Step 8-12 of html.spec.whatwg.org/multipage/#update-the-image-data /// Step 8-12 of html.spec.whatwg.org/multipage/#update-the-image-data
@ -1303,7 +1303,7 @@ impl HTMLImageElement {
let (first, last) = value.split_at(1); let (first, last) = value.split_at(1);
if first != "#" || last.len() == 0 { if first != "#" || last.is_empty() {
return None; return None;
} }
@ -1349,8 +1349,8 @@ pub enum ImageElementMicrotask {
impl MicrotaskRunnable for ImageElementMicrotask { impl MicrotaskRunnable for ImageElementMicrotask {
fn handler(&self) { fn handler(&self) {
match self { match *self {
&ImageElementMicrotask::StableStateUpdateImageDataTask { ImageElementMicrotask::StableStateUpdateImageDataTask {
ref elem, ref elem,
ref generation, ref generation,
} => { } => {
@ -1360,7 +1360,7 @@ impl MicrotaskRunnable for ImageElementMicrotask {
elem.update_the_image_data_sync_steps(); elem.update_the_image_data_sync_steps();
} }
}, },
&ImageElementMicrotask::EnvironmentChangesTask { ImageElementMicrotask::EnvironmentChangesTask {
ref elem, ref elem,
ref generation, ref generation,
} => { } => {
@ -1567,15 +1567,15 @@ impl HTMLImageElementMethods for HTMLImageElement {
let request = self.current_request.borrow(); let request = self.current_request.borrow();
let request_state = request.state; let request_state = request.state;
match request_state { match request_state {
State::CompletelyAvailable | State::Broken => return true, State::CompletelyAvailable | State::Broken => true,
State::PartiallyAvailable | State::Unavailable => return false, State::PartiallyAvailable | State::Unavailable => false,
} }
} }
// https://html.spec.whatwg.org/multipage/#dom-img-currentsrc // https://html.spec.whatwg.org/multipage/#dom-img-currentsrc
fn CurrentSrc(&self) -> USVString { fn CurrentSrc(&self) -> USVString {
let current_request = self.current_request.borrow(); let current_request = self.current_request.borrow();
let ref url = current_request.parsed_url; let url = &current_request.parsed_url;
match *url { match *url {
Some(ref url) => USVString(url.clone().into_string()), Some(ref url) => USVString(url.clone().into_string()),
None => { None => {
@ -1812,7 +1812,7 @@ where
} }
} }
return (s, ""); (s, "")
} }
/// Parse an `srcset` attribute: /// Parse an `srcset` attribute: