Skip to content

Commit 7748086

Browse files
authored
Switch back to upstream capstone (#651)
This PR switches us to `upstream capstone-rs`, now that capstone-rust/capstone-rs#84 has been fixed!
1 parent ebaeedd commit 7748086

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

Cargo.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,6 @@ vsc7448-types = { git = "https://github.com/oxidecomputer/vsc7448.git" }
110110
#
111111
probe-rs = { git = "https://github.com/oxidecomputer/probe-rs.git", branch = "oxide-v0.12.0" }
112112

113-
#
114-
# We need the fix for https://github.com/capstone-rust/capstone-rs/issues/84,
115-
# which upstream seems uninterested in fixing.
116-
#
117-
capstone = {git = "https://github.com/oxidecomputer/capstone-rs.git"}
118-
119113
# Local `path`-based deps
120114
humility = { path = "./humility-core", package = "humility-core" }
121115
humility-arch-arm = { path = "./humility-arch-arm" }
@@ -199,6 +193,7 @@ addr2line = "0.26"
199193
anyhow = { version = "1.0.44", features = ["backtrace"] }
200194
bitfield = "0.19.4"
201195
byteorder = "1.3.4"
196+
capstone = "0.14.0"
202197
cargo-readme = "3.3.1"
203198
cargo_metadata = "0.23.1"
204199
chrono = "0.4.38"

0 commit comments

Comments
 (0)