capstone: update to 2018 edition

Author: tmfink

capstone-rs/Cargo.toml

@@ -8,6 +8,7 @@ license = "MIT"
 name = "capstone"
 repository = "https://github.com/capstone-rust/capstone-rs"
 readme = "README.md"
+edition = "2018"
 version = "0.6.0"
 
 [badges]

capstone-rs/src/arch/arm.rs

@@ -1,24 +1,26 @@
 //! Contains arm-specific types
 
-pub use arch::arch_builder::arm::*;
-use arch::DetailsArchInsn;
-use capstone_sys::{arm_op_mem, arm_op_type, cs_arm, cs_arm_op};
-use instruction::{RegId, RegIdInt};
 use core::convert::From;
 use core::{cmp, fmt, slice};
+
+use capstone_sys::{
+    arm_op_mem, arm_op_type, cs_arm, cs_arm_op, arm_shifter,
+    cs_arm_op__bindgen_ty_2};
 use libc::c_uint;
 
+pub use crate::arch::arch_builder::arm::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
+
 pub use capstone_sys::arm_insn_group as ArmInsnGroup;
 pub use capstone_sys::arm_insn as ArmInsn;
 pub use capstone_sys::arm_reg as ArmReg;
-
 pub use capstone_sys::arm_vectordata_type as ArmVectorData;
 pub use capstone_sys::arm_cpsmode_type as ArmCPSMode;
 pub use capstone_sys::arm_cpsflag_type as ArmCPSFlag;
 pub use capstone_sys::arm_cc as ArmCC;
 pub use capstone_sys::arm_mem_barrier as ArmMemBarrier;
 pub use capstone_sys::arm_setend_type as ArmSetendType;
-use capstone_sys::{arm_shifter, cs_arm_op__bindgen_ty_2};
 
 /// Contains ARM-specific details for an instruction
 pub struct ArmInsnDetail<'a>(pub(crate) &'a cs_arm);

capstone-rs/src/arch/arm64.rs

@@ -1,12 +1,13 @@
 //! Contains arm64-specific types
 
-pub use arch::arch_builder::arm64::*;
-use arch::DetailsArchInsn;
+use libc::c_uint;
+
+pub use crate::arch::arch_builder::arm64::*;
+use crate::arch::DetailsArchInsn;
 use capstone_sys::{arm64_op_mem, arm64_op_type, cs_arm64, cs_arm64_op};
-use instruction::{RegId, RegIdInt};
+use crate::instruction::{RegId, RegIdInt};
 use core::convert::From;
 use core::{cmp, fmt, mem, slice};
-use libc::c_uint;
 
 // Re-exports
 pub use capstone_sys::arm64_insn_group as Arm64InsnGroup;

capstone-rs/src/arch/evm.rs

@@ -1,14 +1,15 @@
 //! Contains EVM-specific types
 
-pub use arch::arch_builder::evm::*;
-use arch::DetailsArchInsn;
-use capstone_sys::cs_evm;
 use core::fmt;
 
+use capstone_sys::cs_evm;
+
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::evm_insn_group as EvmInsnGroup;
 pub use capstone_sys::evm_insn as EvmInsn;
-// no register type since EVM has no operands
+
+pub use crate::arch::arch_builder::evm::*;
+use crate::arch::DetailsArchInsn;
 
 /// Contains EVM-specific details for an instruction
 pub struct EvmInsnDetail<'a>(pub(crate) &'a cs_evm);

capstone-rs/src/arch/m680x.rs

@@ -1,18 +1,21 @@
 //! Contains m680x-specific types
 
-pub use arch::arch_builder::m680x::*;
-use arch::DetailsArchInsn;
+use core::convert::From;
+use core::{fmt, slice};
+
 use capstone_sys::{
     cs_m680x, cs_m680x_op, m680x_op_ext, m680x_op_idx, m680x_op_rel, m680x_op_type,
 };
-use instruction::{RegId, RegIdInt};
-use core::convert::From;
-use core::{fmt, slice};
 
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::m680x_insn as M680xInsn;
 pub use capstone_sys::m680x_reg as M680xReg;
 
+pub use crate::arch::arch_builder::m680x::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
+
+
 /// Contains M680X-specific details for an instruction
 pub struct M680xInsnDetail<'a>(pub(crate) &'a cs_m680x);
 

capstone-rs/src/arch/m68k.rs

@@ -3,23 +3,22 @@
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
-pub use arch::arch_builder::m68k::*;
-use arch::DetailsArchInsn;
 use capstone_sys::{
     cs_m68k, cs_m68k_op, cs_m68k_op__bindgen_ty_1, m68k_address_mode, m68k_cpu_size, m68k_fpu_size,
     m68k_op_br_disp, m68k_op_mem, m68k_op_size, m68k_op_type, m68k_reg, m68k_size_type,
 };
-use Error;
-use instruction::{RegId, RegIdInt};
-use prelude::*;
-
-// XXX todo(tmfink): fix racy initialization in Castone C library M68k
 
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::m68k_address_mode as M68kAddressMode;
 pub use capstone_sys::m68k_insn as M68kInsn;
 pub use capstone_sys::m68k_reg as M68kReg;
 
+pub use crate::arch::arch_builder::m68k::*;
+use crate::arch::DetailsArchInsn;
+use crate::Error;
+use crate::instruction::{RegId, RegIdInt};
+use crate::prelude::*;
+
 
 /// Contains M68K-specific details for an instruction
 pub struct M68kInsnDetail<'a>(pub(crate) &'a cs_m68k);
@@ -468,7 +467,7 @@ mod test {
     use capstone_sys::m68k_address_mode::*;
     use capstone_sys::m68k_op_type::*;
     use capstone_sys::m68k_reg::*;
-    use instruction::*;
+    use crate::instruction::*;
 
     const MEM_ZERO: m68k_op_mem = m68k_op_mem {
         base_reg: M68K_REG_INVALID,
@@ -600,9 +599,9 @@ mod test {
 
     #[test]
     fn op_eq() {
-        use arch::m68k::M68kOperand::*;
-        use arch::m68k::M68kReg::*;
-        use arch::m68k::*;
+        use crate::arch::m68k::M68kOperand::*;
+        use crate::arch::m68k::M68kReg::*;
+        use crate::arch::m68k::*;
         use capstone_sys::m68k_address_mode::*;
 
         assert_ne!(
@@ -637,7 +636,7 @@ mod test {
 
     #[test]
     fn extra_info() {
-        use arch::DetailsArchInsn;
+        use crate::arch::DetailsArchInsn;
 
         let cs = Capstone::new()
             .m68k()

capstone-rs/src/arch/mips.rs

@@ -3,16 +3,17 @@
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
-pub use arch::arch_builder::mips::*;
-use arch::DetailsArchInsn;
 use capstone_sys::{cs_mips, cs_mips_op, mips_op_mem, mips_op_type};
-use instruction::{RegId, RegIdInt};
 
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::mips_insn_group as MipsInsnGroup;
 pub use capstone_sys::mips_insn as MipsInsn;
 pub use capstone_sys::mips_reg as MipsReg;
 
+pub use crate::arch::arch_builder::mips::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
+
 /// Contains MIPS-specific details for an instruction
 pub struct MipsInsnDetail<'a>(pub(crate) &'a cs_mips);
 

capstone-rs/src/arch/mod.rs

@@ -4,9 +4,9 @@ use alloc::vec::Vec;
 use core::fmt::Debug;
 use core::marker::PhantomData;
 
-use capstone::Capstone;
-use constants::Endian;
-use error::CsResult;
+use crate::capstone::Capstone;
+use crate::constants::Endian;
+use crate::error::CsResult;
 
 macro_rules! define_subset_enum {
     ( [
@@ -87,9 +87,9 @@ macro_rules! define_arch_builder {
             pub mod $arch {
                 use alloc::vec::Vec;
 
-                use capstone::Capstone;
-                use constants::{Arch, Endian, ExtraMode, Mode, Syntax};
-                use error::{CsResult, Error};
+                use crate::capstone::Capstone;
+                use crate::constants::{Arch, Endian, ExtraMode, Mode, Syntax};
+                use crate::error::{CsResult, Error};
 
                 define_arch_builder!( @syntax ( $( $syntax, )* ) );
                 define_arch_builder!( @endian ( $( $endian )* ) );
@@ -643,7 +643,7 @@ macro_rules! def_arch_details_struct {
             }
         }
 
-        impl<'a> ::arch::DetailsArchInsn for $InsnDetail<'a> {
+        impl<'a> crate::arch::DetailsArchInsn for $InsnDetail<'a> {
             type OperandIterator = $OperandIteratorLife;
             type Operand = $Operand;
 

capstone-rs/src/arch/ppc.rs

@@ -3,18 +3,17 @@
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
-pub use arch::arch_builder::ppc::*;
-use arch::DetailsArchInsn;
-use capstone_sys::{cs_ppc, cs_ppc_op, ppc_op_mem, ppc_op_type};
-use instruction::{RegId, RegIdInt};
-
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::ppc_insn_group as PpcInsnGroup;
 pub use capstone_sys::ppc_insn as PpcInsn;
 pub use capstone_sys::ppc_reg as PpcReg;
 pub use capstone_sys::ppc_bc as PpcBc;
 pub use capstone_sys::ppc_bh as PpcBh;
-use capstone_sys::ppc_op_crx;
+use capstone_sys::{cs_ppc, cs_ppc_op, ppc_op_mem, ppc_op_crx, ppc_op_type};
+
+pub use crate::arch::arch_builder::ppc::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
 
 /// Contains PPC-specific details for an instruction
 pub struct PpcInsnDetail<'a>(pub(crate) &'a cs_ppc);

capstone-rs/src/arch/sparc.rs

@@ -1,9 +1,5 @@
 //! Contains sparc-specific types
 
-pub use arch::arch_builder::sparc::*;
-use arch::DetailsArchInsn;
-use capstone_sys::{cs_sparc, cs_sparc_op, sparc_op_mem, sparc_op_type};
-use instruction::{RegId, RegIdInt};
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
@@ -13,6 +9,12 @@ pub use capstone_sys::sparc_insn as SparcInsn;
 pub use capstone_sys::sparc_reg as SparcReg;
 pub use capstone_sys::sparc_cc as SparcCC;
 pub use capstone_sys::sparc_hint as SparcHint;
+use capstone_sys::{cs_sparc, cs_sparc_op, sparc_op_mem, sparc_op_type};
+
+pub use crate::arch::arch_builder::sparc::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
+
 
 /// Contains SPARC-specific details for an instruction
 pub struct SparcInsnDetail<'a>(pub(crate) &'a cs_sparc);

capstone-rs/src/arch/sysz.rs

@@ -1,3 +1,3 @@
 //! Contains sysz-specific types
 
-pub use arch::arch_builder::sysz::*;
+pub use crate::arch::arch_builder::sysz::*;

capstone-rs/src/arch/tms320c64x.rs

@@ -1,20 +1,23 @@
 //! Contains tms320c64x-specific types
 
-pub use arch::arch_builder::tms320c64x::*;
+use core::convert::From;
+use core::{cmp, fmt, slice};
+
+use libc::c_int;
 use capstone_sys::{
     cs_tms320c64x, cs_tms320c64x_op, tms320c64x_funit, tms320c64x_mem_dir, tms320c64x_mem_disp,
     tms320c64x_mem_mod, tms320c64x_op_mem, tms320c64x_op_type,
 };
-use instruction::{RegId, RegIdInt};
-use libc::c_int;
-use core::convert::From;
-use core::{cmp, fmt, slice};
 
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::tms320c64x_insn as Tms320c64xInsn;
 pub use capstone_sys::tms320c64x_insn_group as Tms320c64xInsnGroup;
 pub use capstone_sys::tms320c64x_reg as Tms320c64xReg;
 
+pub use crate::arch::arch_builder::tms320c64x::*;
+use crate::instruction::{RegId, RegIdInt};
+
+
 /// Contains TMS320C64X-specific details for an instruction
 pub struct Tms320c64xInsnDetail<'a>(pub(crate) &'a cs_tms320c64x);
 

capstone-rs/src/arch/x86.rs

@@ -1,24 +1,24 @@
 //! Contains x86-specific types
 
-pub use arch::arch_builder::x86::*;
-use arch::DetailsArchInsn;
-use capstone_sys::{x86_op_mem, x86_op_type, cs_x86, cs_x86_op};
-use instruction::{RegId, RegIdInt};
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
+use capstone_sys::{
+    cs_x86_op__bindgen_ty_1, x86_op_mem, x86_op_type, cs_x86, cs_x86_op};
 pub use capstone_sys::x86_insn_group as X86InsnGroup;
 pub use capstone_sys::x86_insn as X86Insn;
 pub use capstone_sys::x86_reg as X86Reg;
 pub use capstone_sys::x86_prefix as X86Prefix;
-
 pub use capstone_sys::x86_avx_bcast as X86AvxBcast;
 pub use capstone_sys::x86_sse_cc as X86SseCC;
 pub use capstone_sys::x86_avx_cc as X86AvxCC;
 pub use capstone_sys::x86_xop_cc as X86XopCC;
 pub use capstone_sys::x86_avx_rm as X86AvxRm;
 
-use capstone_sys::cs_x86_op__bindgen_ty_1;
+pub use crate::arch::arch_builder::x86::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
+
 
 /// Contains X86-specific details for an instruction
 pub struct X86InsnDetail<'a>(pub(crate) &'a cs_x86);

capstone-rs/src/arch/xcore.rs

@@ -1,16 +1,17 @@
 //! Contains xcore-specific types
 
-pub use arch::arch_builder::xcore::*;
-use arch::DetailsArchInsn;
-use capstone_sys::{cs_xcore, cs_xcore_op, xcore_op_mem, xcore_op_type};
-use instruction::{RegId, RegIdInt};
 use core::convert::From;
 use core::{cmp, fmt, slice};
 
 // XXX todo(tmfink): create rusty versions
 pub use capstone_sys::xcore_insn_group as XcoreInsnGroup;
 pub use capstone_sys::xcore_insn as XcoreInsn;
 pub use capstone_sys::xcore_reg as XcoreReg;
+use capstone_sys::{cs_xcore, cs_xcore_op, xcore_op_mem, xcore_op_type};
+
+pub use crate::arch::arch_builder::xcore::*;
+use crate::arch::DetailsArchInsn;
+use crate::instruction::{RegId, RegIdInt};
 
 /// Contains XCORE-specific details for an instruction
 pub struct XcoreInsnDetail<'a>(pub(crate) &'a cs_xcore);

capstone-rs/src/capstone.rs

@@ -2,15 +2,16 @@ use alloc::string::{String, ToString};
 use core::convert::From;
 use core::marker::PhantomData;
 use core::mem;
+
 use libc::{c_int, c_uint, c_void};
 
-use arch::CapstoneBuilder;
+use crate::arch::CapstoneBuilder;
 use capstone_sys::cs_opt_value::*;
 use capstone_sys::*;
-use constants::{Arch, Endian, ExtraMode, Mode, OptValue, Syntax};
-use error::*;
-use ffi::str_from_cstr_ptr;
-use instruction::{Insn, InsnDetail, InsnGroupId, InsnId, Instructions, RegId};
+use crate::constants::{Arch, Endian, ExtraMode, Mode, OptValue, Syntax};
+use crate::error::*;
+use crate::ffi::str_from_cstr_ptr;
+use crate::instruction::{Insn, InsnDetail, InsnGroupId, InsnId, Instructions, RegId};
 
 
 /// An instance of the capstone disassembler

capstone-rs/src/ffi.rs

@@ -23,8 +23,8 @@ pub(crate) unsafe fn str_from_cstr_ptr<'a>(ptr: *const c_char) -> Option<&'a str
 
 #[cfg(test)]
 mod test {
-    use core;
     use super::*;
+    use core;
 
     #[test]
     fn cstr_convert() {