diff options
author | eri <eri@inventati.org> | 2024-03-13 09:31:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-13 08:31:58 +0000 |
commit | 03d64d0675d4d1878232829293e7fdacaec5844e (patch) | |
tree | 6162101c1928052c9c08232e4e7ac784a875a64f /components/canvas | |
parent | 0fda14263a206d99792fcfbec6a5f6dfdb5ff337 (diff) | |
download | servo-03d64d0675d4d1878232829293e7fdacaec5844e.tar.gz servo-03d64d0675d4d1878232829293e7fdacaec5844e.zip |
clippy: Fix assorted warnings in `components/` (#31628)
* clippy: fix assorted warnings in `components/`
* fix: new and default
* fix: review comments
Diffstat (limited to 'components/canvas')
-rw-r--r-- | components/canvas/canvas_data.rs | 3 | ||||
-rw-r--r-- | components/canvas/raqote_backend.rs | 8 | ||||
-rw-r--r-- | components/canvas/webgl_thread.rs | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index 59a0fed8345..7525574a927 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -114,6 +114,7 @@ pub trait GenericPathBuilder { control_point3: &Point2D<f32>, ); fn close(&mut self); + #[allow(clippy::too_many_arguments)] fn ellipse( &mut self, origin: Point2D<f32>, @@ -195,6 +196,7 @@ impl<'a> PathBuilderRef<'a> { .arc(center, radius, start_angle, end_angle, ccw); } + #[allow(clippy::too_many_arguments)] pub fn ellipse( &mut self, center: &Point2D<f32>, @@ -978,6 +980,7 @@ impl<'a> CanvasData<'a> { } } + #[allow(clippy::too_many_arguments)] pub fn ellipse( &mut self, center: &Point2D<f32>, diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs index 902f535e42f..aa3737897eb 100644 --- a/components/canvas/raqote_backend.rs +++ b/components/canvas/raqote_backend.rs @@ -670,7 +670,7 @@ impl GenericDrawTarget for raqote::DrawTarget { } impl Filter { - fn to_raqote(&self) -> raqote::FilterMode { + fn to_raqote(self) -> raqote::FilterMode { match self { Filter::Bilinear => raqote::FilterMode::Bilinear, Filter::Nearest => raqote::FilterMode::Nearest, @@ -847,7 +847,7 @@ pub trait ToRaqotePattern<'a> { } pub trait ToRaqoteGradientStop { - fn to_raqote(&self) -> raqote::GradientStop; + fn to_raqote(self) -> raqote::GradientStop; } /// Clamp a 0..1 number to a 0..255 range to u8. @@ -878,7 +878,7 @@ pub fn clamp_floor_256_f32(val: f32) -> u8 { } impl ToRaqoteGradientStop for CanvasGradientStop { - fn to_raqote(&self) -> raqote::GradientStop { + fn to_raqote(self) -> raqote::GradientStop { let color = raqote::Color::new( self.color.alpha.map(clamp_unit_f32).unwrap_or(0), self.color.red.unwrap_or(0), @@ -890,7 +890,7 @@ impl ToRaqoteGradientStop for CanvasGradientStop { } } -impl<'a> ToRaqotePattern<'_> for FillOrStrokeStyle { +impl ToRaqotePattern<'_> for FillOrStrokeStyle { #[allow(unsafe_code)] fn to_raqote_pattern(self) -> Option<Pattern<'static>> { use canvas_traits::canvas::FillOrStrokeStyle::*; diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index 7362b61e9f4..835056591d3 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -2514,8 +2514,8 @@ fn to_name_in_compiled_shader(s: &str) -> String { fn from_name_in_compiled_shader(s: &str) -> String { map_dot_separated(s, |s, mapped| { - mapped.push_str(if s.starts_with(ANGLE_NAME_PREFIX) { - &s[ANGLE_NAME_PREFIX.len()..] + mapped.push_str(if let Some(stripped) = s.strip_prefix(ANGLE_NAME_PREFIX) { + stripped } else { s }) @@ -2533,6 +2533,7 @@ fn map_dot_separated<F: Fn(&str, &mut String)>(s: &str, f: F) -> String { mapped } +#[allow(clippy::too_many_arguments)] fn prepare_pixels( internal_format: TexFormat, data_type: TexDataType, @@ -3100,7 +3101,8 @@ impl WebXRBridge { contexts: &mut dyn WebXRContexts<WebXRSurfman>, context_id: WebXRContextId, ) { - for (_, manager) in &mut self.managers { + for manager in self.managers.values_mut() { + #[allow(clippy::unnecessary_to_owned)] // Needs mutable borrow later in destroy for (other_id, layer_id) in manager.layers().to_vec() { if other_id == context_id { manager.destroy_layer(device, contexts, context_id, layer_id); |