summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2023-03-14 11:26:59 +0100
committerLibravatar GitHub <noreply@github.com>2023-03-14 11:26:59 +0100
commitde4ae51e3cc30dc2ee1db1686b98a709f9552f80 (patch)
tree09fc36e95e99939842cf14c79d4a08baf9a2da1f /graphics
parent8f14b448d263a2cfd03a998b1d54c21e33d58980 (diff)
parent1816c985fad2ead8dc1e7b62dc8e4bafeed856b2 (diff)
downloadiced-de4ae51e3cc30dc2ee1db1686b98a709f9552f80.tar.gz
iced-de4ae51e3cc30dc2ee1db1686b98a709f9552f80.tar.bz2
iced-de4ae51e3cc30dc2ee1db1686b98a709f9552f80.zip
Merge pull request #1755 from iced-rs/fix/clippy-lints-1.68
Fix `clippy` lints for Rust 1.68
Diffstat (limited to 'graphics')
-rw-r--r--graphics/src/primitive.rs9
-rw-r--r--graphics/src/widget/canvas/cache.rs7
-rw-r--r--graphics/src/widget/canvas/stroke.rs18
3 files changed, 8 insertions, 26 deletions
diff --git a/graphics/src/primitive.rs b/graphics/src/primitive.rs
index 5a163a2f..cef422a2 100644
--- a/graphics/src/primitive.rs
+++ b/graphics/src/primitive.rs
@@ -9,9 +9,10 @@ use crate::triangle;
use std::sync::Arc;
/// A rendering primitive.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
pub enum Primitive {
/// An empty primitive
+ #[default]
None,
/// A group of primitives
Group {
@@ -117,9 +118,3 @@ pub enum Primitive {
cache: Arc<Primitive>,
},
}
-
-impl Default for Primitive {
- fn default() -> Primitive {
- Primitive::None
- }
-}
diff --git a/graphics/src/widget/canvas/cache.rs b/graphics/src/widget/canvas/cache.rs
index 52217bbb..678b0f92 100644
--- a/graphics/src/widget/canvas/cache.rs
+++ b/graphics/src/widget/canvas/cache.rs
@@ -4,7 +4,9 @@ use crate::Primitive;
use iced_native::Size;
use std::{cell::RefCell, sync::Arc};
+#[derive(Default)]
enum State {
+ #[default]
Empty,
Filled {
bounds: Size,
@@ -12,11 +14,6 @@ enum State {
},
}
-impl Default for State {
- fn default() -> Self {
- State::Empty
- }
-}
/// A simple cache that stores generated [`Geometry`] to avoid recomputation.
///
/// A [`Cache`] will not redraw its geometry unless the dimensions of its layer
diff --git a/graphics/src/widget/canvas/stroke.rs b/graphics/src/widget/canvas/stroke.rs
index 4c19251d..49f5701c 100644
--- a/graphics/src/widget/canvas/stroke.rs
+++ b/graphics/src/widget/canvas/stroke.rs
@@ -59,9 +59,10 @@ impl<'a> Default for Stroke<'a> {
}
/// The shape used at the end of open subpaths when they are stroked.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
pub enum LineCap {
/// The stroke for each sub-path does not extend beyond its two endpoints.
+ #[default]
Butt,
/// At the end of each sub-path, the shape representing the stroke will be
/// extended by a square.
@@ -71,12 +72,6 @@ pub enum LineCap {
Round,
}
-impl Default for LineCap {
- fn default() -> LineCap {
- LineCap::Butt
- }
-}
-
impl From<LineCap> for lyon::tessellation::LineCap {
fn from(line_cap: LineCap) -> lyon::tessellation::LineCap {
match line_cap {
@@ -89,9 +84,10 @@ impl From<LineCap> for lyon::tessellation::LineCap {
/// The shape used at the corners of paths or basic shapes when they are
/// stroked.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
pub enum LineJoin {
/// A sharp corner.
+ #[default]
Miter,
/// A round corner.
Round,
@@ -99,12 +95,6 @@ pub enum LineJoin {
Bevel,
}
-impl Default for LineJoin {
- fn default() -> LineJoin {
- LineJoin::Miter
- }
-}
-
impl From<LineJoin> for lyon::tessellation::LineJoin {
fn from(line_join: LineJoin) -> lyon::tessellation::LineJoin {
match line_join {