Bump Rust edition to 2024

Author: Marcondiro

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        toolchain: [1.83, stable, beta]
+        toolchain: [1.85, stable, beta]
     steps:
       - uses: actions/checkout@v4
         with:

Cargo.toml

@@ -5,13 +5,13 @@ authors = [
   "sum_catnip <[email protected]>",
   "Marcondiro <[email protected]>",
 ]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 description = "The Intel Processor Trace (Intel PT) Decoder Library is Intel's reference implementation for decoding Intel PT."
 categories = ["development-tools::debugging", "development-tools::profiling"]
 repository = "https://github.com/sum-catnip/libipt-rs"
 keywords = ["IntelPT", "ProcessorTrace", "libipt"]
-rust-version = "1.83.0"
+rust-version = "1.85.0"
 
 [features]
 libipt_master = ["libipt-sys/libipt_master"]

src/block/decoder.rs

@@ -1,6 +1,6 @@
 use super::Block;
 use crate::asid::Asid;
-use crate::error::{ensure_ptok, extract_status_or_pterr, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok, extract_status_or_pterr};
 use crate::event::Event;
 use crate::image::Image;
 use crate::status::Status;

src/enc_dec_builder/cpu.rs

@@ -1,8 +1,8 @@
 // Certain casts are required only on Windows. Inform Clippy to ignore them.
 #![allow(clippy::unnecessary_cast)]
 
-use crate::error::ensure_ptok;
 use crate::error::PtError;
+use crate::error::ensure_ptok;
 use libipt_sys::{
     pt_cpu, pt_cpu_errata, pt_cpu_vendor, pt_cpu_vendor_pcv_intel, pt_cpu_vendor_pcv_unknown,
     pt_errata,

src/event/qry.rs

@@ -1,5 +1,5 @@
 use crate::enc_dec_builder::{EncoderDecoderBuilder, PtEncoderDecoder};
-use crate::error::{ensure_ptok, extract_status_or_pterr, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok, extract_status_or_pterr};
 use crate::event::Event;
 use crate::status::Status;
 

src/image/iscache.rs

@@ -1,4 +1,4 @@
-use crate::error::{ensure_ptok, extract_pterr, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok, extract_pterr};
 use crate::image::{name_ptr_to_option_string, str_to_cstring_pterror};
 use libipt_sys::{
     pt_image_section_cache, pt_iscache_add_file, pt_iscache_alloc, pt_iscache_free,

src/image/mod.rs

@@ -1,5 +1,5 @@
 use crate::asid::Asid;
-use crate::error::{ensure_ptok, extract_pterr, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok, extract_pterr};
 use libipt_sys::{
     pt_asid, pt_image, pt_image_add_cached, pt_image_add_file, pt_image_alloc, pt_image_copy,
     pt_image_free, pt_image_name, pt_image_remove_by_asid, pt_image_remove_by_filename,
@@ -23,9 +23,11 @@ unsafe extern "C" fn read_callback(
     ip: u64,
     context: *mut c_void,
 ) -> i32 {
-    let buffer = std::slice::from_raw_parts_mut(buffer, size);
-    let asid = Asid(*asid);
-    BoxedCallback::call(context, buffer, ip, asid)
+    unsafe {
+        let buffer = std::slice::from_raw_parts_mut(buffer, size);
+        let asid = Asid(*asid);
+        BoxedCallback::call(context, buffer, ip, asid)
+    }
 }
 
 /// Represent a boxed Rust function that can be passed to and from C code.
@@ -79,9 +81,11 @@ impl BoxedCallback {
 
     /// Invoke the callback behind the given opaque boxed callback pointer.
     unsafe fn call(opaque_cb: *mut c_void, buf: &mut [u8], size: u64, asid: Asid) -> i32 {
-        let raw_boxed_ptr = opaque_cb.cast::<*mut dyn FnMut(&mut [u8], u64, Asid) -> i32>();
-        let func = (*raw_boxed_ptr).as_mut().unwrap();
-        func(buf, size, asid)
+        unsafe {
+            let raw_boxed_ptr = opaque_cb.cast::<*mut dyn FnMut(&mut [u8], u64, Asid) -> i32>();
+            let func = (*raw_boxed_ptr).as_mut().unwrap();
+            func(buf, size, asid)
+        }
     }
 }
 

src/insn/decoder.rs

@@ -2,7 +2,7 @@ use super::Insn;
 use crate::asid::Asid;
 use crate::enc_dec_builder::EncoderDecoderBuilder;
 use crate::enc_dec_builder::PtEncoderDecoder;
-use crate::error::{ensure_ptok, extract_status_or_pterr, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok, extract_status_or_pterr};
 use crate::event::Event;
 use crate::image::Image;
 use crate::status::Status;

src/packet/conversions.rs

@@ -1,5 +1,5 @@
 macro_rules! wrap2raw {
-    ($target:ty, $type:expr, $payload:ident) => {
+    ($target:ty, $type:expr_2021, $payload:ident) => {
         impl From<$target> for libipt_sys::pt_packet {
             #[inline]
             fn from(origin: $target) -> Self {
@@ -14,7 +14,7 @@ macro_rules! wrap2raw {
 }
 
 macro_rules! raw2wrap {
-    ($target:ty, $target_fac:expr, $origin:ty) => {
+    ($target:ty, $target_fac:expr_2021, $origin:ty) => {
         impl From<$origin> for $target {
             #[inline]
             fn from(origin: $origin) -> Self {

src/packet/decoder.rs

@@ -1,5 +1,5 @@
 use super::Packet;
-use crate::error::{ensure_ptok, PtError, PtErrorCode};
+use crate::error::{PtError, PtErrorCode, ensure_ptok};
 
 use crate::enc_dec_builder::{EncoderDecoderBuilder, PtEncoderDecoder};
 use libipt_sys::{