diff options
author | 2022-07-09 19:03:40 +0200 | |
---|---|---|
committer | 2022-07-09 19:03:40 +0200 | |
commit | 9051dd6977d045f991092e247e6bd9da40d2e793 (patch) | |
tree | cde7d983ffc085ed908be776e9021a8e41b44b44 /graphics/src | |
parent | c4c1221be62f51dd9f1d20ea2c4ea6e2c94e20aa (diff) | |
parent | e548d6c0d5b430b090821e673dc453a24c885fbe (diff) | |
download | iced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.gz iced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.bz2 iced-9051dd6977d045f991092e247e6bd9da40d2e793.zip |
Merge pull request #1379 from PolyMeilex/fix/clippy
Address Clippy lints
Diffstat (limited to 'graphics/src')
-rw-r--r-- | graphics/src/font/source.rs | 6 | ||||
-rw-r--r-- | graphics/src/layer.rs | 4 | ||||
-rw-r--r-- | graphics/src/lib.rs | 16 | ||||
-rw-r--r-- | graphics/src/widget/canvas/path.rs | 8 | ||||
-rw-r--r-- | graphics/src/widget/canvas/path/builder.rs | 8 | ||||
-rw-r--r-- | graphics/src/widget/pure/qr_code.rs | 8 | ||||
-rw-r--r-- | graphics/src/widget/qr_code.rs | 13 | ||||
-rw-r--r-- | graphics/src/window/gl_compositor.rs | 3 |
8 files changed, 42 insertions, 24 deletions
diff --git a/graphics/src/font/source.rs b/graphics/src/font/source.rs index a2d3f51d..c0b50e1d 100644 --- a/graphics/src/font/source.rs +++ b/graphics/src/font/source.rs @@ -37,3 +37,9 @@ impl Source { } } } + +impl Default for Source { + fn default() -> Self { + Self::new() + } +} diff --git a/graphics/src/layer.rs b/graphics/src/layer.rs index 93506258..af545713 100644 --- a/graphics/src/layer.rs +++ b/graphics/src/layer.rs @@ -202,7 +202,7 @@ impl<'a> Layer<'a> { Self::process_primitive( layers, translation + *new_translation, - &content, + content, current_layer, ); } @@ -210,7 +210,7 @@ impl<'a> Layer<'a> { Self::process_primitive( layers, translation, - &cache, + cache, current_layer, ); } diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index 370f70d6..a7a1cabb 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -7,11 +7,19 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg" )] -#![deny(missing_docs)] -#![deny(missing_debug_implementations)] -#![deny(unused_results)] -#![deny(unsafe_code)] +#![deny( + missing_debug_implementations, + missing_docs, + unsafe_code, + unused_results, + clippy::extra_unused_lifetimes, + clippy::from_over_into, + clippy::needless_borrow, + clippy::new_without_default, + clippy::useless_conversion +)] #![forbid(rust_2018_idioms)] +#![allow(clippy::inherent_to_string, clippy::type_complexity)] #![cfg_attr(docsrs, feature(doc_cfg))] mod antialiasing; mod error; diff --git a/graphics/src/widget/canvas/path.rs b/graphics/src/widget/canvas/path.rs index 1728f060..f834e286 100644 --- a/graphics/src/widget/canvas/path.rs +++ b/graphics/src/widget/canvas/path.rs @@ -73,9 +73,8 @@ impl Path { pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path { Path::new(|builder| { - let segments_odd = (line_dash.segments.len() % 2 == 1).then(|| { - [&line_dash.segments[..], &line_dash.segments[..]].concat() - }); + let segments_odd = (line_dash.segments.len() % 2 == 1) + .then(|| [line_dash.segments, line_dash.segments].concat()); let mut draw_line = false; @@ -103,8 +102,7 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path { }, index: line_dash.offset, intervals: segments_odd - .as_ref() - .map(Vec::as_slice) + .as_deref() .unwrap_or(line_dash.segments), }, ); diff --git a/graphics/src/widget/canvas/path/builder.rs b/graphics/src/widget/canvas/path/builder.rs index d04dbdde..05316d8a 100644 --- a/graphics/src/widget/canvas/path/builder.rs +++ b/graphics/src/widget/canvas/path/builder.rs @@ -53,7 +53,7 @@ impl Builder { let _ = self.raw.line_to(a); } - let _ = self.raw.arc_to( + self.raw.arc_to( math::Vector::new(radius, radius), math::Angle::radians(0.0), path::ArcFlags::default(), @@ -151,3 +151,9 @@ impl Builder { } } } + +impl Default for Builder { + fn default() -> Self { + Self::new() + } +} diff --git a/graphics/src/widget/pure/qr_code.rs b/graphics/src/widget/pure/qr_code.rs index 23a8ceb6..bff391fe 100644 --- a/graphics/src/widget/pure/qr_code.rs +++ b/graphics/src/widget/pure/qr_code.rs @@ -53,12 +53,12 @@ where } } -impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>> - for QRCode<'a> +impl<'a, Message, B, T> From<QRCode<'a>> + for Element<'a, Message, Renderer<B, T>> where B: Backend, { - fn into(self) -> Element<'a, Message, Renderer<B, T>> { - Element::new(self) + fn from(qr_code: QRCode<'a>) -> Self { + Self::new(qr_code) } } diff --git a/graphics/src/widget/qr_code.rs b/graphics/src/widget/qr_code.rs index 1eb862ba..1a5c0b0a 100644 --- a/graphics/src/widget/qr_code.rs +++ b/graphics/src/widget/qr_code.rs @@ -67,10 +67,7 @@ where let side_length = (self.state.width + 2 * QUIET_ZONE) as f32 * f32::from(self.cell_size); - layout::Node::new(Size::new( - f32::from(side_length), - f32::from(side_length), - )) + layout::Node::new(Size::new(side_length, side_length)) } fn draw( @@ -128,13 +125,13 @@ where } } -impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>> - for QRCode<'a> +impl<'a, Message, B, T> From<QRCode<'a>> + for Element<'a, Message, Renderer<B, T>> where B: Backend, { - fn into(self) -> Element<'a, Message, Renderer<B, T>> { - Element::new(self) + fn from(qr_code: QRCode<'a>) -> Self { + Self::new(qr_code) } } diff --git a/graphics/src/window/gl_compositor.rs b/graphics/src/window/gl_compositor.rs index 4ff17366..722e4d9c 100644 --- a/graphics/src/window/gl_compositor.rs +++ b/graphics/src/window/gl_compositor.rs @@ -35,6 +35,9 @@ pub trait GLCompositor: Sized { /// Creates a new [`GLCompositor`] and [`Renderer`] with the given /// [`Settings`] and an OpenGL address loader function. /// + /// # Safety + /// The `loader_function` should resolve to valid OpenGL bindings. + /// /// [`Renderer`]: crate::Renderer /// [`Backend`]: crate::Backend /// [`Settings`]: Self::Settings |