Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Dependencies #685

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions src/assets.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down Expand Up @@ -48,7 +48,7 @@ async fn read_file(path: &str) -> ZResult<String> {

async fn deserialize_from_file<D: DeserializeOwned>(path: &str) -> ZResult<D> {
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<Key: Hash + Eq + Copy>(
Expand Down
2 changes: 1 addition & 1 deletion src/screen/agent_info.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/screen/battle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{
time::Duration,
};

use heck::TitleCase;
use heck::ToTitleCase;
use log::{info, trace};
use mq::{color::Color, math::Vec2};

Expand Down
2 changes: 1 addition & 1 deletion src/screen/campaign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down