From 967346f32cf5bd4d1db68eb43acb43fa319f8aaa Mon Sep 17 00:00:00 2001 From: xshady Date: Sun, 12 May 2024 01:38:47 +0300 Subject: [PATCH] finally get rid of lmnkjgkj-std-backtrace-anyhow --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- test/rust_resource/src/error_backtrace.rs | 6 ++++++ test/rust_resource/src/lib.rs | 5 +++++ 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 test/rust_resource/src/error_backtrace.rs diff --git a/Cargo.lock b/Cargo.lock index 5a93b25a..585c900f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ dependencies = [ "altv_internal_logger", "altv_internal_mvalue", "altv_internal_sdk", + "anyhow", "autocxx", "erased-serde", - "lmnkjgkj-std-backtrace-anyhow", "paste", "serde", "serde_bytes", @@ -56,7 +56,7 @@ name = "altv_internal_core_shared" version = "16.0.0-dev.3" dependencies = [ "altv_internal_sdk", - "lmnkjgkj-std-backtrace-anyhow", + "anyhow", ] [[package]] @@ -110,6 +110,12 @@ dependencies = [ "paste", ] +[[package]] +name = "anyhow" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" + [[package]] name = "aquamarine" version = "0.1.12" @@ -394,8 +400,8 @@ dependencies = [ name = "cpp_codegen" version = "16.0.0-dev.3" dependencies = [ + "anyhow", "lazy_static", - "lmnkjgkj-std-backtrace-anyhow", ] [[package]] @@ -883,12 +889,6 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" -[[package]] -name = "lmnkjgkj-std-backtrace-anyhow" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c82e39f592ba28a66fdc90c994db478bd5bb19bd92ed1273d7eab9caa091de" - [[package]] name = "lock_api" version = "0.4.11" diff --git a/Cargo.toml b/Cargo.toml index 0b9cf92c..193f8693 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ readme = "README.md" [workspace.dependencies] cxx = "1.0.115" autocxx = "0.26.0" -anyhow = { package = "lmnkjgkj-std-backtrace-anyhow", version = "0.0.1" } +anyhow = "1.0.83" paste = "1.0.14" lazy_static = "1.4.0" serde = { version = "1.0.195", features = ["derive", "rc"] } diff --git a/test/rust_resource/src/error_backtrace.rs b/test/rust_resource/src/error_backtrace.rs new file mode 100644 index 00000000..2d593fb9 --- /dev/null +++ b/test/rust_resource/src/error_backtrace.rs @@ -0,0 +1,6 @@ +use altv::anyhow::anyhow; + +pub(crate) fn test_error_backtrace() { + let error = anyhow!("test error"); + altv::log!("{}", error.backtrace()); +} diff --git a/test/rust_resource/src/lib.rs b/test/rust_resource/src/lib.rs index 2ca7172a..c53d0d6c 100644 --- a/test/rust_resource/src/lib.rs +++ b/test/rust_resource/src/lib.rs @@ -36,6 +36,9 @@ use events::test_events; mod ped; use ped::test_ped; +mod error_backtrace; +use error_backtrace::test_error_backtrace; + #[altv::main] fn main() -> impl altv::IntoVoidResult { std::env::set_var("RUST_BACKTRACE", "full"); @@ -66,6 +69,8 @@ fn main() -> impl altv::IntoVoidResult { test_resource(); altv::log!("#################### events"); test_events(); + altv::log!("#################### error_backtrace"); + test_error_backtrace(); altv::set_timeout( || {