update to edition 2024

Author: Aloso

Cargo.toml

@@ -10,7 +10,7 @@ members = [
 ]
 default-members = ["./pomsky-bin", "./pomsky-lib", "./pomsky-syntax"]
 resolver = "2"
-package.edition = "2021"
+package.edition = "2024"
 
 [profile.release]
 lto = "thin"

benchmark/benches/main.rs

@@ -1,4 +1,4 @@
-use pomsky::{diagnose::Diagnostic, options::CompileOptions, Expr};
+use pomsky::{Expr, diagnose::Diagnostic, options::CompileOptions};
 
 const STRINGS: &str = include_str!("./files/strings.pomsky");
 const PROPERTIES: &str = include_str!("./files/properties.pomsky");
@@ -21,7 +21,7 @@ macro_rules! items {
 
 #[divan::bench_group]
 mod parse {
-    use divan::{counter::BytesCount, Bencher};
+    use divan::{Bencher, counter::BytesCount};
     use pomsky::Expr;
 
     macro_rules! group_item {
@@ -56,8 +56,8 @@ mod parse {
 mod compile {
     use divan::Bencher;
     use pomsky::{
-        options::{CompileOptions, RegexFlavor},
         Expr,
+        options::{CompileOptions, RegexFlavor},
     };
 
     fn ruby() -> CompileOptions {
@@ -97,7 +97,7 @@ mod compile {
 
 #[divan::bench(args = 1..=13)]
 pub fn range(bencher: divan::Bencher, n: usize) {
-    let max = "3458709621".repeat((n + 9) / 10);
+    let max = "3458709621".repeat(n.div_ceil(10));
     let max = &max[..n];
     let input = format!("range '0'-'{max}'");
 

pomsky-bin/src/args/help.rs

@@ -1,4 +1,4 @@
-use helptext::{sections, Help, HelpSection};
+use helptext::{Help, HelpSection, sections};
 use supports_color::Stream;
 
 const USAGE: Help = Help(sections![

pomsky-bin/src/args/parse.rs

@@ -1,4 +1,4 @@
-use std::io::{stdin, stdout, IsTerminal};
+use std::io::{IsTerminal, stdin, stdout};
 use std::path::PathBuf;
 
 use pomsky::{features::PomskyFeatures, options::RegexFlavor};

pomsky-bin/src/lib.rs

@@ -15,8 +15,8 @@ pub use result::{
 use std::{path::Path, process::exit, time::Instant};
 
 use pomsky::{
-    options::{CompileOptions as PomskyCompileOptions, RegexFlavor},
     Expr,
+    options::{CompileOptions as PomskyCompileOptions, RegexFlavor},
 };
 
 use args::{CompileOptions, GlobalOptions, Input};

pomsky-bin/src/result/serde_code.rs

@@ -1,7 +1,7 @@
 use pomsky::diagnose::DiagnosticCode;
 use serde::{
-    de::{Error, Expected, Unexpected, Visitor},
     Deserializer, Serializer,
+    de::{Error, Expected, Unexpected, Visitor},
 };
 
 pub(super) fn serialize<S>(value: &Option<DiagnosticCode>, serializer: S) -> Result<S::Ok, S::Error>

pomsky-bin/src/test_runner.rs

@@ -2,11 +2,11 @@ use std::ops::Index;
 
 use pcre2::bytes::Regex as PcreRegex;
 use pomsky::{
+    Expr,
     diagnose::{Diagnostic, DiagnosticCode, Severity},
     features::PomskyFeatures,
     options::CompileOptions,
     test::{CaptureIdent, TestCase, TestCaseMatch, TestCaseMatchAll, TestCaseReject},
-    Expr,
 };
 use regex::Regex as RustRegex;
 

pomsky-bin/src/testing.rs

@@ -4,9 +4,9 @@ use helptext::text;
 use pomsky::options::RegexFlavor;
 
 use crate::{
+    CompilationResult,
     args::{CompileOptions, GlobalOptions, Input, RegexEngine, TestOptions},
     format::Logger,
-    CompilationResult,
 };
 
 pub(crate) struct TestDirectoryResult {
@@ -120,21 +120,13 @@ fn test_directory(
         .filter_entry(is_dir_or_pomsky_file)
         .build()
     {
-        if let Ok(entry) = entry.map_err(|d| handle_walk_error(d, logger, current_dir)) {
-            if entry.file_type().is_some_and(|ty| ty.is_file()) {
-                total += 1;
+        if let Ok(entry) = entry.map_err(|d| handle_walk_error(d, logger, current_dir))
+            && entry.file_type().is_some_and(|ty| ty.is_file())
+        {
+            total += 1;
 
-                let path = entry.path();
-                test_single(
-                    logger,
-                    path,
-                    current_dir,
-                    args,
-                    compile_args,
-                    &mut results,
-                    &mut failed,
-                );
-            }
+            let path = entry.path();
+            test_single(logger, path, current_dir, args, compile_args, &mut results, &mut failed);
         };
     }
 

pomsky-bin/tests/e2e.rs

@@ -49,13 +49,9 @@ impl predicates::Predicate<[u8]> for Output {
         }
     }
 
-    fn find_case(&self, expected: bool, variable: &[u8]) -> Option<Case> {
+    fn find_case(&self, expected: bool, variable: &[u8]) -> Option<Case<'_>> {
         let actual = self.eval(variable);
-        if expected == actual {
-            Some(Case::new(Some(self), actual))
-        } else {
-            None
-        }
+        if expected == actual { Some(Case::new(Some(self), actual)) } else { None }
     }
 }
 

pomsky-lib/src/diagnose/compile_error.rs

@@ -1,6 +1,6 @@
 use pomsky_syntax::{
-    diagnose::{ParseError, ParseErrorKind},
     Span,
+    diagnose::{ParseError, ParseErrorKind},
 };
 
 use crate::{exprs::char_class::RegexCharSetItem, options::RegexFlavor};
@@ -210,7 +210,10 @@ impl core::fmt::Display for CompileErrorKind {
                 write!(f, "Unit tests may only appear at the top level of the expression")
             }
             CompileErrorKind::UnsupportedInLookbehind { flavor, feature } => {
-                write!(f, "Feature `{feature:?}` is not supported within lookbehinds in the {flavor:?} flavor")
+                write!(
+                    f,
+                    "Feature `{feature:?}` is not supported within lookbehinds in the {flavor:?} flavor"
+                )
             }
             CompileErrorKind::LookbehindNotConstantLength { flavor } => match flavor {
                 RegexFlavor::Pcre | RegexFlavor::Python => write!(