diff --git a/Cargo.lock b/Cargo.lock index b5bd04d..33ef515 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler32" version = "1.2.0" @@ -126,9 +128,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitreader" @@ -452,12 +454,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" @@ -1097,9 +1096,9 @@ dependencies = [ [[package]] name = "ron" -version = "0.6.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", "bitflags", @@ -1344,12 +1343,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - [[package]] name = "unicode-xid" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 594de3d..375c6e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = ["zcomponents", "zgui", "zscene"] assets = "assets/" [dependencies] -ron = "0.6" +ron = "0.8.0" log = "0.4" env_logger = "0.9" derive_more = { version = "0.99", features = ["from"] } @@ -28,7 +28,7 @@ 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.0" once_cell = "1.6" [dev-dependencies] diff --git a/src/assets.rs b/src/assets.rs index 352b9a1..46728ba 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -1,7 +1,7 @@ //! This module groups all the async loading stuff. // TODO: https://github.com/rust-lang/rust-clippy/issues/4637 -#![allow(clippy::eval_order_dependence)] +#![allow(clippy::mixed_read_write_in_expression)] use std::{collections::HashMap, hash::Hash}; @@ -48,7 +48,7 @@ async fn read_file(path: &str) -> ZResult { async fn deserialize_from_file(path: &str) -> ZResult { let s = read_file(path).await?; - ron::de::from_str(&s).map_err(|e| ZError::from_ron_de_error(e, path.into())) + ron::de::from_str(&s).map_err(|e| ZError::from_ron_de_error(e.into(), path.into())) } async fn load_map( diff --git a/src/screen/agent_info.rs b/src/screen/agent_info.rs index 30fa9ac..a61af7c 100644 --- a/src/screen/agent_info.rs +++ b/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}; diff --git a/src/screen/battle.rs b/src/screen/battle.rs index 8d7f3a1..87053c4 100644 --- a/src/screen/battle.rs +++ b/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}; diff --git a/src/screen/campaign.rs b/src/screen/campaign.rs index fe4742e..5c17024 100644 --- a/src/screen/campaign.rs +++ b/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};