Merge branch 'master' into farewell_to_gdb_openocd

Author: labbott

Cargo.lock

@@ -108,12 +108,6 @@ vsc7448-types = { git = "https://github.com/oxidecomputer/vsc7448.git" }
 #
 probe-rs = { git = "https://github.com/oxidecomputer/probe-rs.git", branch = "oxide-v0.12.0" }
 
-#
-# We need the fix for https://github.com/capstone-rust/capstone-rs/issues/84,
-# which upstream seems uninterested in fixing.
-#
-capstone = {git = "https://github.com/oxidecomputer/capstone-rs.git"}
-
 # Local `path`-based deps
 humility = { path = "./humility-core", package = "humility-core" }
 humility-arch-arm = { path = "./humility-arch-arm" }
@@ -195,6 +189,7 @@ addr2line = "0.26"
 anyhow = { version = "1.0.44", features = ["backtrace"] }
 bitfield = "0.19.4"
 byteorder = "1.3.4"
+capstone = "0.14.0"
 cargo-readme = "3.3.1"
 cargo_metadata = "0.23.1"
 chrono = "0.4.38"