Update deps and editions

Cargo.toml

@@ -2,7 +2,7 @@
 name = "zemeroth"
 version = "0.7.0-snapshot"
 authors = ["Andrey Lesnikov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "MIT/Apache-2.0"
 description = "A 2D turn-based hexagonal tactical game."
 
@@ -16,10 +16,10 @@ members = ["zcomponents", "zgui", "zscene"]
 assets = "assets/"
 
 [dependencies]
-ron = "0.6"
+ron = "0.8"
 log = "0.4"
-env_logger = "0.9"
-derive_more = { version = "0.99", features = ["from"] }
+env_logger = "0.10"
+derive_more = { version = "0.99", features = ["from"] } # TODO: https://github.com/ozkriff/zemeroth/issues/251
 serde = { version = "1.0", features = ["derive"] }
 num = { version = "0.4", default-features = false }
 ui = { path = "zgui", package = "zgui" }
@@ -28,8 +28,8 @@ zcomponents = { path = "zcomponents" }
 rand = { version = "0.8", default-features = false, features = ["alloc"] }
 quad-rand = { version = "0.2", features = ["rand"] }
 mq = { package = "macroquad", version = "0.3" }
-heck = "0.3"
+heck = "0.4.1"
 once_cell = "1.6"
 
 [dev-dependencies]
-pretty_assertions = "0.7"
+pretty_assertions = "1.3"

src/error.rs

@@ -5,7 +5,7 @@ pub enum ZError {
     Ui(ui::Error),
     Scene(zscene::Error),
     RonDeserialize {
-        error: ron::de::Error,
+        error: ron::de::SpannedError,
         path: PathBuf,
     },
     IO(io::Error),
@@ -14,7 +14,7 @@ pub enum ZError {
 }
 
 impl ZError {
-    pub fn from_ron_de_error(error: ron::de::Error, path: PathBuf) -> Self {
+    pub fn from_ron_de_error(error: ron::de::SpannedError, path: PathBuf) -> Self {
         ZError::RonDeserialize { error, path }
     }
 }

src/screen/agent_info.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use heck::TitleCase;
+use heck::ToTitleCase;
 use mq::{color::Color, math::Vec2};
 use ui::{self, Drawable, Gui, Widget};
 

src/screen/battle.rs

@@ -3,7 +3,7 @@ use std::{
     time::Duration,
 };
 
-use heck::TitleCase;
+use heck::ToTitleCase;
 use log::{info, trace};
 use mq::{color::Color, math::Vec2};
 

src/screen/campaign.rs

@@ -3,7 +3,7 @@ use std::{
     time::Duration,
 };
 
-use heck::TitleCase;
+use heck::ToTitleCase;
 use log::info;
 use mq::{math::Vec2, text::Font};
 use ui::{self, Drawable, Gui, Widget};

zcomponents/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zcomponents"
 version = "0.2.0"
 authors = ["Andrey Lesnikov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "MIT/Apache-2.0"
 description = "ZComponents is a stupid component storage"
 repository = "https://github.com/ozkriff/zemeroth"

zgui/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zgui"
 version = "0.1.0"
 authors = ["Andrey Lesnikov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "MIT/Apache-2.0"
 description = "Tiny and opionated GUI library"
 keywords = ["gamedev", "gui"]

zgui/src/lib.rs

@@ -166,6 +166,7 @@ impl Sprite {
                         font,
                         font_scale,
                         font_scale_aspect,
+                        rotation: 0.0,
                         color: self.color,
                     },
                 );

zscene/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zscene"
 version = "0.1.0"
 authors = ["Andrey Lesnikov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "MIT/Apache-2.0"
 description = "Scene and Actions for gwg"
 keywords = ["gamedev", "2D"]