Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Sirius902 committed Nov 12, 2024
1 parent 2d4edbe commit a4d3dd3
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 155 deletions.
196 changes: 63 additions & 133 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions crates/gcfeeder-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ edition = "2021"
conv = "0.3"
crossbeam = "0.8"
enclose = "1"
enum-iterator = "1"
enum-iterator = "2"
enum_dispatch = "0.3"
nalgebra = "0.32"
nalgebra = "0.33"
once_cell = "1"
rayon = "1"
rusb = "0.9"
thiserror = "1"
thiserror = "2"

[dependencies.gcinput]
path = "../../lib/gcinput"
Expand Down
14 changes: 7 additions & 7 deletions crates/gcfeeder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ bincode = "1"
crossbeam = "0.8"
dirs = "5"
egui = "0.29"
enum-iterator = "1"
nalgebra = "0.32"
enum-iterator = "2"
nalgebra = "0.33"
once_cell = "1"
rayon = "1"
rusb = "0.9"
thiserror = "1"
toml = "0.7"
thiserror = "2"
toml = "0.8"
winit = "0.30"

[dependencies.gcinput]
Expand All @@ -33,7 +33,7 @@ default-features = false
features = ["accesskit", "default_fonts", "wgpu"]

[dependencies.image]
version = "0.24"
version = "0.25"
default-features = false
features = ["png"]

Expand All @@ -59,9 +59,9 @@ default-features = false
features = ["git", "gitcl"]

[target.'cfg(windows)'.build-dependencies]
embed-resource = "2"
embed-resource = "3"

[target.'cfg(windows)'.build-dependencies.image]
version = "0.24"
version = "0.25"
default-features = false
features = ["png", "ico"]
4 changes: 3 additions & 1 deletion crates/gcfeeder/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ pub fn main() {
.and_then(|mut f| f.write_all("IDI_ICON1 ICON DISCARDABLE \"icon.ico\"".as_bytes()))
.unwrap();

embed_resource::compile(&rc_path, embed_resource::NONE);
embed_resource::compile(&rc_path, embed_resource::NONE)
.manifest_optional()
.unwrap();
}
}
2 changes: 1 addition & 1 deletion crates/gcfeeder/src/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub fn run() -> eframe::Result<()> {
format!("gcfeeder | {version_string}").as_str(),
options,
#[cfg(windows)]
Box::new(move |_cc| Box::new(App::new(input_source, tray_rx, log_rx))),
Box::new(move |_cc| Ok(Box::new(App::new(input_source, tray_rx, log_rx)))),
#[cfg(not(windows))]
Box::new(move |_cc| Ok(Box::new(App::new(input_source, log_rx)))),
)
Expand Down
4 changes: 2 additions & 2 deletions lib/gcinput/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ repository = "https://github.com/Sirius902/gcfeeder/"
edition = "2021"

[dependencies.nalgebra]
version = "0.32"
version = "0.33"
optional = true

[dependencies.serde]
version = "1.0"
version = "1"
features = ["derive"]

[features]
Expand Down
3 changes: 0 additions & 3 deletions lib/panic-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ name = "panic-log"
version = "0.1.0"
repository = "https://github.com/Sirius902/gcfeeder/"
edition = "2021"

[dependencies]
backtrace = "0.3"
8 changes: 3 additions & 5 deletions lib/panic-log/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
#![deny(clippy::all)]
use std::{
fs, io,
panic::PanicInfo,
panic::PanicHookInfo,
sync::atomic::{AtomicBool, Ordering},
thread,
};

use backtrace::Backtrace;

static PANICKED: AtomicBool = AtomicBool::new(false);

/// Attempts to log panic information with a backtrace to `panic.log` in
/// the current working directory.
///
/// Implementation adapted from Rust's default panic hook.
pub fn hook(info: &PanicInfo<'_>) {
pub fn hook(info: &PanicHookInfo) {
if let Ok(mut log) = fs::File::create("panic.log") {
// The current implementation always returns `Some`.
let location = info.location().unwrap();
Expand All @@ -32,7 +30,7 @@ pub fn hook(info: &PanicInfo<'_>) {
let write = |err: &mut dyn io::Write| {
let _ = writeln!(err, "thread '{name}' panicked at '{msg}', {location}");

let backtrace = Backtrace::new();
let backtrace = std::backtrace::Backtrace::force_capture();
let _ = writeln!(err, "stack backtrace:");
let _ = err.write_all(format!("{backtrace:#?}").as_bytes());
};
Expand Down

0 comments on commit a4d3dd3

Please sign in to comment.