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

Lint layout_2020 with clippy (#31169)

Browse source 
cargo clippy --fix -p layout_2020 --allow-dirty --broken-code
This commit is contained in:
Oriol Brufau 2024-01-25 10:03:31 +01:00 • committed by GitHub
parent 886f6c58d4
commit 50f56affe3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 224 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/layout_2020/replaced.rs
View file

@ -150,9 +150,8 @@ impl ReplacedContent {
}
};
let intrinsic = intrinsic_size_in_dots.map_or_else(
|| IntrinsicSizes::empty(),
|intrinsic_size_in_dots| {
let intrinsic =
intrinsic_size_in_dots.map_or_else(IntrinsicSizes::empty, |intrinsic_size_in_dots| {
// FIXME: should 'image-resolution' (when implemented) be used *instead* of
// `script::dom::htmlimageelement::ImageRequest::current_pixel_density`?
// https://drafts.csswg.org/css-images-4/#the-image-resolution
@ -160,15 +159,14 @@ impl ReplacedContent {
let width = (intrinsic_size_in_dots.width as CSSFloat) / dppx;
let height = (intrinsic_size_in_dots.height as CSSFloat) / dppx;
IntrinsicSizes::from_width_and_height(width, height)
},
);
});
let base_fragment_info = BaseFragmentInfo::new_for_node(element.opaque());
return Some(Self {
Some(Self {
kind,
intrinsic,
base_fragment_info,
});
})
}
pub fn from_image_url<'dom>(
@ -246,8 +244,8 @@ impl ReplacedContent {
}
}
pub fn make_fragments<'a>(
&'a self,
pub fn make_fragments(
&self,
style: &ServoArc<ComputedValues>,
size: LogicalVec2<Length>,
) -> Vec<Fragment> {
@ -334,10 +332,10 @@ impl ReplacedContent {
let intrinsic_size = self.flow_relative_intrinsic_size(style);
let intrinsic_ratio = self.inline_size_over_block_size_intrinsic_ratio(style);
let box_size = box_size.unwrap_or(style.content_box_size(containing_block, &pbm));
let max_box_size = style.content_max_box_size(containing_block, &pbm);
let box_size = box_size.unwrap_or(style.content_box_size(containing_block, pbm));
let max_box_size = style.content_max_box_size(containing_block, pbm);
let min_box_size = style
.content_min_box_size(containing_block, &pbm)
.content_min_box_size(containing_block, pbm)
.auto_is(Length::zero);
let default_object_size = || {