diff options
author | Pi-Cla <pirateclip@protonmail.com> | 2024-05-02 14:02:21 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 20:02:21 +0000 |
commit | 160c7c0b0f061afa1277fa56cdd1d898379a8223 (patch) | |
tree | 3ef1bf1092d13912ec702cb507fe6ebf2ec81702 /components/gfx/font_cache_thread.rs | |
parent | ca064eaa518f407988751ce51834eff3d65b681c (diff) | |
download | servo-160c7c0b0f061afa1277fa56cdd1d898379a8223.tar.gz servo-160c7c0b0f061afa1277fa56cdd1d898379a8223.zip |
Fix some clippy warnings in `components/gfx` and `components/script` (#32215)
* clippy: Squish warnings and errors in gfx
warning: redundant closure (gfx/font.rs:415:18)
warning: useless conversion to the same type (gfx/font.rs:534:9)
warning: the following explicit lifetimes could be elided: 'a (gfx/font.rs:619:16)
error: this loop never actually loops (gfx/font_cache_thread.rs:112:9)
warning: this expression creates a reference which is immediately dereferenced by the compiler (gfx/font_cache_thread.rs:229:51)
warning: redundant closure (gfx/font_cache_thread.rs:551:18)
3 instances of:
warning: casting integer literal to `f64` is unnecessary (gfx/platform/freetype/font_list.rs:271-273)
* clippy: methods called `from_*` usually take no `self`
It reports that by standard convention, from_* methods should not take any `&self` parameter
* clippy: you should consider adding a `Default` implementation
It reports that public types with a pub fn new() -> Self should have a Default implementation since they can be constructed without arguments
* clippy: casting to the same type is unnecessary (`f32` -> `f32`)
* clippy: use of `unwrap_or_else` to construct default value
* clippy: methods called `is_*` usually take `self` by mutable reference or `self` by reference or no `self`
* clippy: manual `!RangeInclusive::contains` implementation
contains expresses the intent better and has less failure modes (such as fencepost errors or using || instead of &&)
* clippy: this function has an empty `#[must_use]` attribute, but returns a type already marked as `#[must_use]`
* clippy: Fix some new warnings
warning: this `if` statement can be collapsed (gfx/font.rs:468:130)
warning: this lifetime isn't used in the impl (gfx/platform/freetype/font.rs:341:6)
warning: field assignment outside of initializer for an instance created with Default::default() (compositor.rs:881:17)
Diffstat (limited to 'components/gfx/font_cache_thread.rs')
-rw-r--r-- | components/gfx/font_cache_thread.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/gfx/font_cache_thread.rs b/components/gfx/font_cache_thread.rs index 3c1790edb6f..22cd5edee47 100644 --- a/components/gfx/font_cache_thread.rs +++ b/components/gfx/font_cache_thread.rs @@ -108,7 +108,7 @@ impl FontTemplates { // If a request is made for a font family that exists, // pick the first valid font in the family if we failed // to find an exact match for the descriptor. - for template in &mut self.templates.iter() { + if let Some(template) = self.templates.first() { return vec![template.clone()]; } @@ -231,7 +231,7 @@ impl FontCache { .font_data .entry(identifier) .or_insert_with(|| font_template.data()); - let _ = bytes_sender.send(&data); + let _ = bytes_sender.send(data); } }, Command::GetFontInstance(identifier, pt_size, flags, result) => { @@ -557,10 +557,7 @@ impl From<&FontFaceRuleData> for CSSFontFaceDescriptors { ), } } - let style = rule_data - .style - .as_ref() - .map(|style| style_to_computed(style)); + let style = rule_data.style.as_ref().map(style_to_computed); let unicode_range = rule_data .unicode_range .as_ref() |