upgrade to edition 2024

Author: Firestar99

Cargo.toml

@@ -10,7 +10,7 @@ description = "Wrapper crate for SPIRV-Tools"
 repository = "https://github.com/rust-gpu/spirv-tools-rs"
 version = "0.12.2"
 authors = ["Embark <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 documentation = "https://docs.rs/spirv-tools"

spirv-tools-sys/Cargo.toml

@@ -4,7 +4,7 @@ description = "Wrapper crate for SPIRV-Tools"
 repository = "https://github.com/rust-gpu/spirv-tools-rs"
 version = "0.12.2"
 authors = ["Embark <[email protected]>"]
-edition = "2021"
+edition = "2024"
 # This is the same license for the underlying SPIRV-Tools code
 license = "Apache-2.0"
 documentation = "https://docs.rs/spirv-tools-sys"

spirv-tools-sys/src/assembler.rs

@@ -31,7 +31,7 @@ pub enum DisassembleOptions {
     Comment = 0x80,
 }
 
-extern "C" {
+unsafe extern "C" {
     /// Encodes the given SPIR-V assembly text to its binary representation. The
     /// length parameter specifies the number of bytes for text. Encoded binary will
     /// be stored into *binary. Any error will be written into *diagnostic if

spirv-tools-sys/src/diagnostics.rs

@@ -42,7 +42,7 @@ pub type MessageCallback = extern "C" fn(
     *mut std::ffi::c_void,       // context we use for mapping
 );
 
-extern "C" {
+unsafe extern "C" {
     /// Destroys a diagnostic object.  This is a no-op if diagnostic is a null
     /// pointer.
     #[link_name = "spvDiagnosticDestroy"]

spirv-tools-sys/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(unsafe_code)]
+
 #[cfg(not(any(feature = "use-installed-tools", feature = "use-compiled-tools")))]
 compile_error!("Enable at least one of `use-compiled-tools` or `use-installed-tools` features");
 

spirv-tools-sys/src/opt.rs

@@ -491,7 +491,7 @@ pub enum Passes {
     WrapOpKill,
 }
 
-extern "C" {
+unsafe extern "C" {
     pub fn optimizer_create(env: crate::shared::TargetEnv) -> *mut Optimizer;
     pub fn optimizer_destroy(opt: *mut Optimizer);
 

spirv-tools-sys/src/shared.rs

@@ -271,7 +271,7 @@ pub struct ToolContext {
     _unused: [u8; 0],
 }
 
-extern "C" {
+unsafe extern "C" {
     /// Creates a context object for most of the SPIRV-Tools API.
     /// Returns null if env is invalid.
     ///

spirv-tools-sys/src/val.rs

@@ -19,7 +19,7 @@ pub enum ValidatorLimits {
     IdBound,
 }
 
-extern "C" {
+unsafe extern "C" {
     /// Validates a SPIR-V binary for correctness. Any errors will be written into
     /// *diagnostic if diagnostic is non-null, otherwise the context's message
     /// consumer will be used.

src/error.rs

@@ -52,23 +52,25 @@ impl Diagnostic {
     pub(crate) unsafe fn from_diag(
         diag: *mut diagnostics::Diagnostic,
     ) -> Result<Self, shared::SpirvResult> {
-        if diag.is_null() {
-            return Err(shared::SpirvResult::Success);
-        }
+        unsafe {
+            if diag.is_null() {
+                return Err(shared::SpirvResult::Success);
+            }
 
-        let (message, notes) = Message::message_and_notes_from_cstr((*diag).error);
+            let (message, notes) = Message::message_and_notes_from_cstr((*diag).error);
 
-        let res = Self {
-            line: (*diag).position.line,
-            column: (*diag).position.column,
-            index: (*diag).position.index,
-            message,
-            notes,
-            is_text: (*diag).is_text_source,
-        };
+            let res = Self {
+                line: (*diag).position.line,
+                column: (*diag).position.column,
+                index: (*diag).position.index,
+                message,
+                notes,
+                is_text: (*diag).is_text_source,
+            };
 
-        diagnostics::diagnostic_destroy(diag);
-        Ok(res)
+            diagnostics::diagnostic_destroy(diag);
+            Ok(res)
+        }
     }
 }
 
@@ -126,15 +128,17 @@ impl Message {
 
     #[cfg(feature = "use-compiled-tools")]
     unsafe fn message_and_notes_from_cstr(msg: *const std::os::raw::c_char) -> (String, String) {
-        let full_message = std::ffi::CStr::from_ptr(msg).to_string_lossy();
-
-        if let Some(ind) = full_message.find('\n') {
-            (
-                full_message[..ind].to_owned(),
-                full_message[ind + 1..].to_owned(),
-            )
-        } else {
-            (full_message.into_owned(), String::new())
+        unsafe {
+            let full_message = std::ffi::CStr::from_ptr(msg).to_string_lossy();
+
+            if let Some(ind) = full_message.find('\n') {
+                (
+                    full_message[..ind].to_owned(),
+                    full_message[ind + 1..].to_owned(),
+                )
+            } else {
+                (full_message.into_owned(), String::new())
+            }
         }
     }
 

tests/val.rs

@@ -5,7 +5,7 @@ const SPIRV_BIN: &[u8] = include_bytes!("wgpu_example_shader.spv");
 fn validate_compiled(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
     #[cfg(feature = "use-compiled-tools")]
     {
-        use spirv_tools::val::{compiled::CompiledValidator, Validator};
+        use spirv_tools::val::{Validator, compiled::CompiledValidator};
         let cv = CompiledValidator::default();
         Some(cv.validate(_input, None))
     }
@@ -16,7 +16,7 @@ fn validate_compiled(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
 fn validate_tool(_input: &[u32]) -> Option<Result<(), spirv_tools::Error>> {
     #[cfg(feature = "use-installed-tools")]
     {
-        use spirv_tools::val::{tool::ToolValidator, Validator};
+        use spirv_tools::val::{Validator, tool::ToolValidator};
         let cv = ToolValidator::default();
         Some(cv.validate(_input, None))
     }