diff options
| author | Mason Reed <mason@vector35.com> | 2024-12-13 17:34:59 -0500 |
|---|---|---|
| committer | Mason Reed <mason@vector35.com> | 2024-12-13 17:42:38 -0500 |
| commit | 095f86d8ed42cb71fc8fa3c0bd6c572daf824cbc (patch) | |
| tree | 4c7ff924f0c80368bf981733b46123e193cc3613 /rust | |
| parent | 042b43f6d3f084526a0e5cf15e0ee93f9c849d27 (diff) | |
Bump supported rust version to 1.83.0
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | rust/Cargo.lock | 205 | ||||
| -rw-r--r-- | rust/Cargo.toml | 5 | ||||
| -rw-r--r-- | rust/README.md | 2 | ||||
| -rw-r--r-- | rust/binaryninjacore-sys/Cargo.toml | 6 | ||||
| -rw-r--r-- | rust/examples/decompile/Cargo.toml | 2 | ||||
| -rw-r--r-- | rust/examples/minidump/Cargo.toml | 2 | ||||
| -rw-r--r-- | rust/examples/pdb-ng/Cargo.toml | 2 | ||||
| -rw-r--r-- | rust/src/lib.rs | 2 |
9 files changed, 22 insertions, 206 deletions
diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt index 92c6926e..ac679832 100644 --- a/rust/CMakeLists.txt +++ b/rust/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR) project(rust_api) -set(CARGO_API_VERSION 1.77.0) +set(CARGO_API_VERSION 1.83.0) file(GLOB RUST_API_SOURCES CONFIGURE_DEPENDS ../binaryninjacore.h diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3f98dda6..682aae2f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -96,12 +96,6 @@ dependencies = [ ] [[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] name = "backtrace" version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -139,6 +133,7 @@ name = "binaryninjacore-sys" version = "0.1.0" dependencies = [ "bindgen", + "proc-macro2", ] [[package]] @@ -152,14 +147,14 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.70.1" +version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -321,15 +316,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] - -[[package]] name = "decompile" version = "0.1.0" dependencies = [ @@ -407,15 +393,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -569,12 +546,6 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] name = "jobserver" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -624,58 +595,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "minidump" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20da5c0aab8b6d683d8a15ca70db468d3f6ddfe38269837c22c7bab7ba2627c" -dependencies = [ - "debugid", - "encoding_rs", - "memmap2", - "minidump-common", - "num-traits", - "range-map", - "scroll", - "thiserror", - "time", - "tracing", - "uuid", -] - -[[package]] -name = "minidump-common" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b23ab3a13de24f89fa3060579288f142ac4d138d37eec8a398ba59b0ca4d577" -dependencies = [ - "bitflags", - "debugid", - "num-derive", - "num-traits", - "range-map", - "scroll", - "smart-default", -] - -[[package]] -name = "minidump_bn" -version = "0.1.0" -dependencies = [ - "binaryninja", - "log", - "minidump", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -721,26 +640,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] name = "object" version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -784,8 +683,6 @@ version = "0.1.0" dependencies = [ "anyhow", "binaryninja", - "cab", - "home", "itertools 0.11.0", "log", "pdb", @@ -807,12 +704,6 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] name = "pkg-config" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -836,9 +727,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -853,15 +744,6 @@ dependencies = [ ] [[package]] -name = "range-map" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f" -dependencies = [ - "num-traits", -] - -[[package]] name = "rayon" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -918,9 +800,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "ruzstd" @@ -938,20 +820,6 @@ name = "scroll" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] [[package]] name = "serde" @@ -980,17 +848,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "smart-default" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1072,12 +929,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde", "time-core", - "time-macros", ] [[package]] @@ -1087,48 +942,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] -name = "time-macros" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 59c71c6b..4f4703a3 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -3,7 +3,7 @@ name = "binaryninja" version = "0.1.0" authors = ["Ryan Snyder <ryan@vector35.com>", "Kyle Martin <kyle@vector35.com>"] edition = "2021" -rust-version = "1.77.0" +rust-version = "1.83.0" [features] noexports = [] @@ -29,7 +29,8 @@ members = [ "examples/dwarf/shared", "examples/idb_import", "examples/flowgraph", - "examples/minidump", + # TODO: Disabled until they can update time dependency. + # "examples/minidump", "examples/mlil_visitor", "examples/mlil_lifter", "examples/hlil_visitor", diff --git a/rust/README.md b/rust/README.md index 8a037f65..00898327 100644 --- a/rust/README.md +++ b/rust/README.md @@ -4,7 +4,7 @@ > :warning: **These bindings are in a very early beta, only have partial support for the core APIs and are still actively under development. Compatibility _will_ break and conventions _will_ change! They are being used for core Binary Ninja features however, so we expect much of what is already there to be reliable enough to build on, just don't be surprised if your plugins/scripts need to hit a moving target.** -> :warning: This project runs on Rust version `1.77.0` +> :warning: This project runs on Rust version `1.83.0` ## Contributing diff --git a/rust/binaryninjacore-sys/Cargo.toml b/rust/binaryninjacore-sys/Cargo.toml index 3984f74d..7c6b080f 100644 --- a/rust/binaryninjacore-sys/Cargo.toml +++ b/rust/binaryninjacore-sys/Cargo.toml @@ -3,6 +3,10 @@ name = "binaryninjacore-sys" version = "0.1.0" authors = ["Ryan Snyder <ryan@vector35.com>", "Kyle Martin <kyle@vector35.com>"] build = "build.rs" +edition = "2021" [build-dependencies] -bindgen = "^0.70.1" +bindgen = "0.71.1" +# TODO: Remove this once bindgen correctly pins the version. +# proc-macro2 v1.0.79 does not have https://docs.rs/proc-macro2/1.0.80/proc_macro2/struct.Literal.html#method.c_string +proc-macro2 = ">=1.0.80"
\ No newline at end of file diff --git a/rust/examples/decompile/Cargo.toml b/rust/examples/decompile/Cargo.toml index 09c510f6..63d61c26 100644 --- a/rust/examples/decompile/Cargo.toml +++ b/rust/examples/decompile/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] binaryninja = {path="../../"} -clap = { version = "4.4", features = ["derive"] } +clap = { version = "4.5", features = ["derive"] } diff --git a/rust/examples/minidump/Cargo.toml b/rust/examples/minidump/Cargo.toml index 3e54fd6c..5f5a7317 100644 --- a/rust/examples/minidump/Cargo.toml +++ b/rust/examples/minidump/Cargo.toml @@ -9,4 +9,4 @@ crate-type = ["cdylib"] [dependencies] binaryninja = {path="../../"} log = "0.4.20" -minidump = "0.18.0" +minidump = "0.23.0" diff --git a/rust/examples/pdb-ng/Cargo.toml b/rust/examples/pdb-ng/Cargo.toml index 8636bced..6302f121 100644 --- a/rust/examples/pdb-ng/Cargo.toml +++ b/rust/examples/pdb-ng/Cargo.toml @@ -9,11 +9,9 @@ crate-type = ["cdylib"] [dependencies] anyhow = "^1.0" binaryninja = {path = "../../"} -home = "^0.5.5" itertools = "^0.11" log = "^0.4" pdb = "^0.8" -cab = "^0.4" regex = "1" [features] diff --git a/rust/src/lib.rs b/rust/src/lib.rs index a0667eb0..272af926 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -35,7 +35,7 @@ //! //! > ⚠️ **These bindings are in a very early beta, only have partial support for the core APIs and are still actively under development. Compatibility _will_ break and conventions _will_ change! They are being used for core Binary Ninja features however, so we expect much of what is already there to be reliable enough to build on, just don't be surprised if your plugins/scripts need to hit a moving target.** //! -//! > ⚠️ This project runs on Rust version `1.77.0` +//! > ⚠️ This project runs on Rust version `1.83.0` //! //! --- //! |
