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

Dependency update #50

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 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
25 changes: 2 additions & 23 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ readme = "README.md"

[dependencies]
bevy = {version="0.14.0", features = [ "bevy_render", "bevy_core_pipeline", "bevy_asset", "bevy_sprite", "bevy_winit", "png", "x11", "bevy_ui", "tga", "bmp", "jpeg", "webgl2"], default-features=false }
bevy_egui = "0.29.0"
bevy_egui = "0.28.0"
bevy_pancam = { version = "0.13.0", features = ["bevy_egui"] }
bevy_prototype_lyon = "0.12.0"
colorgrad = "0.6.2"
Expand All @@ -23,7 +23,6 @@ serde_json = "1.0.125"
proc-macro2 = "1.0.86"
chrono = "0.4.38"
roarsvg = "0.4.1"
anyhow = "1.0.86"
image = "0.25.2"
thiserror="1.0"
# dependencies exclusive for wasm32
Expand Down
2 changes: 1 addition & 1 deletion src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ where
) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
Box::pin(async move {
let mut bytes = Vec::new();
reader.read_to_end(&mut bytes).await.unwrap();
reader.read_to_end(&mut bytes).await.map_err(CustomJsonLoaderError::Io).unwrap();
Guelakais marked this conversation as resolved.
Show resolved Hide resolved
let custom_asset = serde_json::from_slice::<A>(&bytes).unwrap();
Ok(custom_asset)
})
Expand Down
2 changes: 1 addition & 1 deletion src/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,6 @@ fn pop_infobox(
1.,
0.,
)))
.unwrap();
.map_err(|e|format!("Error:{}",e.get_represented_type_info().unwrap().type_path())).unwrap();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This unwrap is not acceptable either.

Removing the unwrap (leaving the error unhandled) makes drag and dropping work but we should investigate why exactly this error arises.

}
}
Loading