From e80c7dff8d1c6ac40084bbaaece57844443c807c Mon Sep 17 00:00:00 2001 From: Jedsek Date: Thu, 19 Jan 2023 19:09:45 +0800 Subject: [PATCH 1/2] Update preset.rs --- examples/game_of_life/src/preset.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/examples/game_of_life/src/preset.rs b/examples/game_of_life/src/preset.rs index 964b912036..fef10a979e 100644 --- a/examples/game_of_life/src/preset.rs +++ b/examples/game_of_life/src/preset.rs @@ -1,6 +1,7 @@ -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] pub enum Preset { Custom, + [default] Xkcd, Glider, SmallExploder, @@ -114,12 +115,6 @@ impl Preset { } } -impl Default for Preset { - fn default() -> Preset { - Preset::Xkcd - } -} - impl std::fmt::Display for Preset { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!( From 8acf7c41fc11d95056e6a4823b616afbcb2b99d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n?= Date: Thu, 19 Jan 2023 20:20:13 +0100 Subject: [PATCH 2/2] Fix `#[default]` in `preset` for `game_of_life` example --- examples/game_of_life/src/preset.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/game_of_life/src/preset.rs b/examples/game_of_life/src/preset.rs index fef10a979e..552527b193 100644 --- a/examples/game_of_life/src/preset.rs +++ b/examples/game_of_life/src/preset.rs @@ -1,7 +1,7 @@ #[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] pub enum Preset { Custom, - [default] + #[default] Xkcd, Glider, SmallExploder,