Update to the 2024 edition

Author: noib3

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "crop"
 version = "0.4.2"
-edition = "2021"
-rust-version = "1.65"
+edition = "2024"
+rust-version = "1.85"
 authors = ["Riccardo Mazzarini <[email protected]>"]
 description = "A pretty fast text rope"
 documentation = "https://docs.rs/crop"
@@ -11,7 +11,13 @@ readme = "README.md"
 license = "MIT"
 keywords = ["rope", "tree", "edit", "buffer"]
 categories = ["data-structures", "text-editors", "text-processing"]
-exclude = ["/.github/*", "/examples/**", "/fuzz/**", "/tests/**", "/BENCHMARKS.md"]
+exclude = [
+  "/.github/*",
+  "/examples/**",
+  "/fuzz/**",
+  "/tests/**",
+  "/BENCHMARKS.md",
+]
 
 [package.metadata.docs.rs]
 features = ["graphemes", "simd", "utf16-metric"]

benches/creation.rs

@@ -2,7 +2,7 @@ mod common;
 
 use common::{LARGE, MEDIUM, SMALL, TINY};
 use criterion::measurement::WallTime;
-use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
+use criterion::{BenchmarkGroup, Criterion, criterion_group, criterion_main};
 use crop::{Rope, RopeBuilder};
 
 fn bench<F: Fn(&str)>(group: &mut BenchmarkGroup<WallTime>, to_bench: F) {

benches/editing.rs

@@ -1,13 +1,13 @@
 mod common;
 
-use common::{PercentRanges, LARGE, MEDIUM, SMALL, TINY};
+use common::{LARGE, MEDIUM, PercentRanges, SMALL, TINY};
 use criterion::measurement::WallTime;
 use criterion::{
-    criterion_group,
-    criterion_main,
     Bencher,
     BenchmarkGroup,
     Criterion,
+    criterion_group,
+    criterion_main,
 };
 use crop::Rope;
 

benches/graphemes.rs

@@ -1,7 +1,7 @@
 mod common;
 
 use common::{LARGE, MEDIUM, SMALL, TINY};
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use crop::Rope;
 
 fn iter_graphemes(c: &mut Criterion) {

benches/iterators.rs

@@ -1,8 +1,8 @@
 mod common;
 
 use common::{LARGE, MEDIUM, SMALL, TINY};
-use criterion::{criterion_group, criterion_main, Criterion};
-use crop::{iter::*, Rope};
+use criterion::{Criterion, criterion_group, criterion_main};
+use crop::{Rope, iter::*};
 
 #[macro_export]
 macro_rules! iter_bench {

benches/metric_conversion.rs

@@ -1,7 +1,7 @@
 mod common;
 
 use common::{LARGE, MEDIUM, SMALL, TINY};
-use criterion::{criterion_group, criterion_main, Bencher, Criterion};
+use criterion::{Bencher, Criterion, criterion_group, criterion_main};
 use crop::Rope;
 
 fn line_of_byte(c: &mut Criterion) {

benches/slicing.rs

@@ -1,12 +1,12 @@
 mod common;
 
-use common::{PercentRanges, LARGE, MEDIUM, SMALL, TINY};
+use common::{LARGE, MEDIUM, PercentRanges, SMALL, TINY};
 use criterion::{
-    criterion_group,
-    criterion_main,
     BatchSize,
     Bencher,
     Criterion,
+    criterion_group,
+    criterion_main,
 };
 use crop::Rope;
 

src/lib.rs

@@ -166,13 +166,13 @@ pub mod tree;
 
 // These are not part of the public API, we only export them to be able to run
 // doctests.
+pub use rope::{Rope, RopeBuilder, RopeSlice};
 #[doc(hidden)]
 pub use rope::{
     gap_buffer::GapBuffer,
     gap_slice::GapSlice,
     metrics::ChunkSummary,
 };
-pub use rope::{Rope, RopeBuilder, RopeSlice};
 
 #[inline]
 pub(crate) fn range_bounds_to_start_end<T, B>(

src/rope/gap_slice.rs

@@ -339,7 +339,7 @@ impl<'a> GapSlice<'a> {
                 return (
                     self.left_chunk().as_bytes(),
                     self.right_chunk().as_bytes(),
-                )
+                );
             },
         };
 

src/rope/rope.rs

@@ -1,11 +1,11 @@
 use alloc::string::String;
 use core::ops::RangeBounds;
 
+use super::RopeSlice;
 use super::gap_buffer::GapBuffer;
 use super::iterators::{Bytes, Chars, Chunks, Lines, RawLines};
 use super::metrics::{ByteMetric, RawLineMetric};
 use super::utils::{panic_messages as panic, *};
-use super::RopeSlice;
 use crate::range_bounds_to_start_end;
 use crate::tree::Tree;
 

src/rope/rope_builder.rs

@@ -1,8 +1,8 @@
+use super::Rope;
 use super::gap_buffer::GapBuffer;
 use super::metrics::ChunkSummary;
 use super::rope::RopeChunk;
 use super::utils::split_adjusted;
-use super::Rope;
 use crate::tree::TreeBuilder;
 
 /// An incremental [`Rope`](crate::Rope) builder.
@@ -41,11 +41,7 @@ fn gap_buffer_push_with_remainder<'a, const MAX_BYTES: usize>(
 
     *buffer_len_left += push.len();
 
-    if rest.is_empty() {
-        None
-    } else {
-        Some(rest)
-    }
+    if rest.is_empty() { None } else { Some(rest) }
 }
 
 impl RopeBuilder {

src/rope/rope_slice.rs

@@ -1,11 +1,11 @@
 use alloc::string::String;
 use core::ops::RangeBounds;
 
+use super::Rope;
 use super::iterators::{Bytes, Chars, Chunks, Lines, RawLines};
 use super::metrics::{ByteMetric, RawLineMetric};
 use super::rope::RopeChunk;
 use super::utils::{panic_messages as panic, *};
-use super::Rope;
 use crate::range_bounds_to_start_end;
 use crate::tree::TreeSlice;
 
@@ -619,11 +619,9 @@ impl<'a> RopeSlice<'a> {
     /// Panics if this slice doesn't have a trailing line break.
     #[inline]
     pub(super) fn truncate_trailing_line_break(&mut self) {
-        debug_assert!(self
-            .tree_slice
-            .end_slice()
-            .last_chunk()
-            .ends_with('\n'));
+        debug_assert!(
+            self.tree_slice.end_slice().last_chunk().ends_with('\n')
+        );
 
         self.truncate_last_char();
 

src/tree/leaves.rs

@@ -598,7 +598,7 @@ impl<'a, const N: usize, L: Leaf> LeavesBackward<'a, N, L> {
 
 #[cfg(test)]
 mod tests {
-    use rand::{thread_rng, Rng};
+    use rand::{Rng, thread_rng};
 
     use super::*;
 

src/tree/node_internal.rs

@@ -711,7 +711,7 @@ impl<const N: usize, L: Leaf> Inode<N, L> {
         &mut self,
         mut child_offset: usize,
         children: I,
-    ) -> Option<impl ExactSizeIterator<Item = Self>>
+    ) -> Option<impl ExactSizeIterator<Item = Self> + use<I, N, L>>
     where
         I: IntoIterator<Item = Arc<Node<N, L>>>,
         I::IntoIter: ExactSizeIterator,
@@ -737,10 +737,9 @@ impl<const N: usize, L: Leaf> Inode<N, L> {
         );
 
         while self.is_underfilled() {
-            let next = if let Some(next) = children.next() {
-                next
-            } else {
-                last_children.next().unwrap()
+            let next = match children.next() {
+                Some(next) => next,
+                _ => last_children.next().unwrap(),
             };
             self.push(next);
         }

src/tree/node_leaf.rs

@@ -100,7 +100,7 @@ impl<L: Leaf> Lnode<L> {
         &mut self,
         range: R,
         replace_with: L::Replacement<'_>,
-    ) -> Option<impl ExactSizeIterator<Item = Self>>
+    ) -> Option<impl ExactSizeIterator<Item = Self> + use<M, R, L>>
     where
         M: Metric<L::Summary>,
         R: RangeBounds<M>,

src/tree/tiny_arc.rs

@@ -6,7 +6,7 @@
 
 use alloc::boxed::Box;
 use core::mem::MaybeUninit;
-use core::ptr::{addr_of_mut, NonNull};
+use core::ptr::{NonNull, addr_of_mut};
 use core::sync::atomic;
 
 /// A tiny `Arc` without weak references.
@@ -39,7 +39,7 @@ impl<T> Arc<T> {
 
     #[inline]
     pub(super) unsafe fn get_mut_unchecked(this: &mut Self) -> &mut T {
-        &mut this.ptr.as_mut().data
+        unsafe { &mut this.ptr.as_mut().data }
     }
 
     #[inline]