Update Rust Edition (#1)

* Update version * Fix clippy errors
TinTeam · Jan 25, 2022 · dd1529e · dd1529e
1 parent ec0ee7a
commit dd1529e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/devkit/Cargo.toml b/devkit/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["sn-50", "fantasy", "console", "computer"]
 categories = ["games", "game-development", "game-engines"]
 license = "MIT"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tinlib = { version = "0.1.0", path = "../tinlib" }
diff --git a/tinlib/Cargo.toml b/tinlib/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["sn-50", "fantasy", "console", "computer"]
 categories = ["games", "game-development", "game-engines"]
 license = "MIT"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-log = "0.4.8"
+log = "0.4.14"
diff --git a/tinlib/src/graphic/color.rs b/tinlib/src/graphic/color.rs
@@ -1,7 +1,7 @@
 //! Color implementation and manipulation.
 
 /// A color representation with red, green and blue values.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq)]
 pub struct Color {
     red: u8,
     green: u8,
@@ -40,16 +40,6 @@ impl Color {
     }
 }
 
-impl Default for Color {
-    fn default() -> Self {
-        Self {
-            red: 0,
-            green: 0,
-            blue: 0,
-        }
-    }
-}
-
 impl From<(u8, u8, u8)> for Color {
     fn from(value: (u8, u8, u8)) -> Self {
         Self::new(value.0, value.1, value.2)
@@ -93,15 +83,6 @@ mod tests {
         assert_eq!(color.blue(), 3);
     }
 
-    #[test]
-    fn test_color_default() {
-        let color = Color::default();
-
-        assert_eq!(color.red, 0);
-        assert_eq!(color.green, 0);
-        assert_eq!(color.blue, 0);
-    }
-
     #[test]
     fn test_color_from_tuple() {
         let tuple = (1u8, 2u8, 3u8);

diff --git a/tinlib/src/machine/input.rs b/tinlib/src/machine/input.rs
@@ -1,7 +1,2 @@
+#[derive(Default)]
 pub struct Input;
-
-impl Default for Input {
-    fn default() -> Self {
-        Self {}
-    }
-}
diff --git a/tinlib/src/machine/ram.rs b/tinlib/src/machine/ram.rs
@@ -4,6 +4,7 @@ use crate::machine::input::Input;
 use crate::map::Map;
 
 /// The machine RAM representation.
+#[derive(Default)]
 pub struct RAM<'map> {
     code: Code,
     map: Map<'map>,
@@ -41,14 +42,3 @@ impl<'map> RAM<'map> {
         &mut self.input
     }
 }
-
-impl<'map> Default for RAM<'map> {
-    // Creates a new RAM.
-    fn default() -> Self {
-        Self {
-            code: Code::default(),
-            map: Map::default(),
-            input: Input::default(),
-        }
-    }
-}