Migrate to edition 2024

Author: w1th0utnam3

splashsurf/Cargo.toml

@@ -7,7 +7,7 @@ description = "Command-line tool for surface reconstruction of SPH particle data
 keywords = ["sph", "particle", "surface", "reconstruction", "marching-cubes"]
 categories = ["command-line-utilities", "graphics", "science", "simulation", "visualization"]
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 
 homepage = "https://splashsurf.physics-simulation.org"
 repository = "https://github.com/InteractiveComputerGraphics/splashsurf"

splashsurf/src/allocator.rs

@@ -11,8 +11,10 @@ pub struct CountingAllocator<A: GlobalAlloc> {
 // TODO: Is Ordering::AcqRel ok to use?
 
 unsafe impl<A: GlobalAlloc> GlobalAlloc for CountingAllocator<A> {
+    /// Allocates memory and counts the number of bytes allocated (current and peak allocation).
+    /// Safety: See [`GlobalAlloc::alloc`].
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let ret = self.allocator.alloc(layout);
+        let ret = unsafe { self.allocator.alloc(layout) };
         if !ret.is_null() {
             let old_allocation = self
                 .current_allocation
@@ -24,8 +26,10 @@ unsafe impl<A: GlobalAlloc> GlobalAlloc for CountingAllocator<A> {
         ret
     }
 
+    /// Deallocates memory and counts the number of bytes deallocated.
+    /// Safety: See [`GlobalAlloc::dealloc`].
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        self.allocator.dealloc(ptr, layout);
+        unsafe { self.allocator.dealloc(ptr, layout) };
         self.current_allocation
             .fetch_sub(layout.size() as u64, Ordering::AcqRel);
     }

splashsurf_lib/Cargo.toml

@@ -7,7 +7,7 @@ description = "Library for surface reconstruction of SPH particle data"
 keywords = ["sph", "particle", "surface", "reconstruction", "marching-cubes"]
 categories = ["graphics", "science", "simulation", "visualization", "rendering"]
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 
 homepage = "https://splashsurf.physics-simulation.org"
 repository = "https://github.com/InteractiveComputerGraphics/splashsurf"

splashsurf_lib/src/mesh.rs

@@ -751,8 +751,8 @@ impl<R: Real> TriMesh3d<R> {
     /// The other mesh will be empty after this operation.
     pub fn append(&mut self, other: &mut TriMesh3d<R>) {
         let TriMesh3d {
-            vertices: ref mut new_verts,
-            triangles: ref mut new_tris,
+            vertices: new_verts,
+            triangles: new_tris,
         } = other;
 
         let vertex_offset = self.vertices.len();

splashsurf_lib/src/utils.rs

@@ -163,10 +163,11 @@ impl<'a, T> UnsafeSlice<'a, T> {
 
     /// Returns a mutable reference to an element of the wrapped slice without doing bounds checking, simultaneous access has to be disjoint!
     /// SAFETY: It is unsound to obtain two mutable references to the same index.
+    /// SAFETY: Calling this method with an out-of-bounds index is undefined behavior.
     #[allow(clippy::mut_from_ref)]
     pub unsafe fn get_mut_unchecked(&self, i: usize) -> &mut T {
         debug_assert!(i < self.len(), "index out of bounds");
-        &mut *self.slice.get_unchecked(i).get()
+        unsafe { &mut *self.slice.get_unchecked(i).get() }
     }
 }