From 168a3fd34824adc9c6a606cd144219701f15cccf Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Wed, 17 Dec 2025 21:23:46 -0500 Subject: [Rust] Replace `log` with `tracing` - Added more documentation - Replaced global named logger for plugins, fixing the issue when the CU has multiple (e.g. statically linked demo) - Simplified some misc code This is a breaking change, but I believe there is no better time to make it, we cannot continue to use the `log` crate, it is too limited for our needs. --- Cargo.lock | 68 ++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 22 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 92577f86..d042ef57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -134,7 +134,6 @@ version = "0.1.0" dependencies = [ "binaryninja", "binaryninjacore-sys", - "log", "msp430-asm", ] @@ -144,7 +143,6 @@ version = "0.1.0" dependencies = [ "binaryninja", "binaryninjacore-sys", - "log", "rayon", "riscv-dis", ] @@ -182,7 +180,6 @@ version = "0.1.0" dependencies = [ "binaryninjacore-sys", "insta", - "log", "rayon", "rstest", "serde", @@ -191,6 +188,8 @@ dependencies = [ "serial_test", "tempfile", "thiserror 2.0.12", + "tracing", + "tracing-subscriber", ] [[package]] @@ -691,7 +690,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -713,7 +712,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "gimli", - "log", "object 0.32.2", ] @@ -728,7 +726,6 @@ dependencies = [ "gimli", "indexmap", "iset", - "log", "object 0.36.7", "regex", ] @@ -744,7 +741,6 @@ dependencies = [ "gimli", "indexmap", "iset", - "log", "object 0.36.7", "regex", ] @@ -1111,7 +1107,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "idb-rs", - "log", ] [[package]] @@ -1263,6 +1258,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "libc" version = "0.2.174" @@ -1373,7 +1374,6 @@ version = "0.1.0" dependencies = [ "binaryninja", "binaryninjacore-sys", - "log", "minidump", ] @@ -1647,7 +1647,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "itertools 0.14.0", - "log", "pdb", "regex", ] @@ -1660,7 +1659,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "itertools 0.14.0", - "log", "pdb", "regex", ] @@ -2192,6 +2190,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -2281,7 +2288,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "insta", - "log", "serde_json", "svd-parser", ] @@ -2293,7 +2299,6 @@ dependencies = [ "binaryninja", "binaryninjacore-sys", "insta", - "log", "serde_json", "svd-parser", ] @@ -2372,6 +2377,15 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + [[package]] name = "tiff" version = "0.9.1" @@ -2443,9 +2457,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" dependencies = [ "log", "pin-project-lite", @@ -2455,9 +2469,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -2466,13 +2480,26 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", ] +[[package]] +name = "tracing-subscriber" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +dependencies = [ + "parking_lot", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -2589,7 +2616,6 @@ dependencies = [ "directories", "insta", "itertools 0.14.0", - "log", "minijinja", "minijinja-embed", "rayon", @@ -2619,7 +2645,6 @@ dependencies = [ "directories", "insta", "itertools 0.14.0", - "log", "minijinja", "minijinja-embed", "rayon", @@ -3008,7 +3033,6 @@ dependencies = [ "binaryninjacore-sys", "bstr", "dashmap", - "log", "once_cell", "thiserror 2.0.12", ] -- cgit v1.3.1