Update edition

Author: Jake-Shadle

Cargo.toml

@@ -7,10 +7,10 @@ authors = [
     "Embark <[email protected]>",
     "Jake Shadle <[email protected]>",
 ]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-rust-version = "1.70.0"
+rust-version = "1.85.0"
 documentation = "https://docs.rs/cfg-expr"
 homepage = "https://github.com/EmbarkStudios/cfg-expr"
 keywords = ["cargo", "rustc", "cfg"]

examples/eval.rs

@@ -1,4 +1,4 @@
-use cfg_expr::{targets::get_builtin_target_by_triple, Expression, Predicate};
+use cfg_expr::{Expression, Predicate, targets::get_builtin_target_by_triple};
 
 fn main() {
     let specific = Expression::parse(

src/expr.rs

@@ -100,10 +100,10 @@ impl TargetMatcher for target_lexicon::Triple {
     #[allow(clippy::cognitive_complexity)]
     #[allow(clippy::match_same_arms)]
     fn matches(&self, tp: &TargetPredicate) -> bool {
-        use target_lexicon::*;
         use TargetPredicate::{
             Abi, Arch, Endian, Env, Family, HasAtomic, Os, Panic, PointerWidth, Vendor,
         };
+        use target_lexicon::*;
 
         const NUTTX: target_lexicon::Vendor =
             target_lexicon::Vendor::Custom(target_lexicon::CustomVendor::Static("nuttx"));
@@ -265,9 +265,9 @@ impl TargetMatcher for target_lexicon::Triple {
             Family(fam) => {
                 use OperatingSystem::{
                     Aix, AmdHsa, Bitrig, Cloudabi, Cuda, Darwin, Dragonfly, Emscripten, Espidf,
-                    Freebsd, Fuchsia, Haiku, Hermit, Horizon, Hurd, Illumos, L4re, Linux, MacOSX,
-                    Nebulet, Netbsd, None_, Openbsd, Redox, Solaris, TvOS, Uefi, Unknown, VisionOS,
-                    VxWorks, Wasi, WasiP1, WasiP2, WatchOS, Windows, IOS,
+                    Freebsd, Fuchsia, Haiku, Hermit, Horizon, Hurd, IOS, Illumos, L4re, Linux,
+                    MacOSX, Nebulet, Netbsd, None_, Openbsd, Redox, Solaris, TvOS, Uefi, Unknown,
+                    VisionOS, VxWorks, Wasi, WasiP1, WasiP2, WatchOS, Windows,
                 };
 
                 match self.operating_system {

src/expr/parser.rs

@@ -1,8 +1,8 @@
 use crate::{
     error::{ParseError, Reason},
     expr::{
-        lexer::{Lexer, Token},
         ExprNode, Expression, Func, InnerPredicate,
+        lexer::{Lexer, Token},
     },
 };
 use smallvec::SmallVec;
@@ -200,7 +200,7 @@ impl Expression {
                                     "target_pointer_width",
                                     "target_vendor",
                                 ]),
-                            })
+                            });
                         }
                     };
 

tests/eval.rs

@@ -1,7 +1,7 @@
 use cfg_expr::{
-    expr::{Predicate, TargetMatcher},
-    targets::{get_builtin_target_by_triple, ALL_BUILTINS as all},
     Expression, TargetPredicate,
+    expr::{Predicate, TargetMatcher},
+    targets::{ALL_BUILTINS as all, get_builtin_target_by_triple},
 };
 
 struct Target {

tests/parser.rs

@@ -1,8 +1,8 @@
 use cfg_expr::{
+    Expression, ParseError,
     error::Reason,
     expr::{Predicate as P, TargetPredicate as TP},
     targets::*,
-    Expression, ParseError,
 };
 
 macro_rules! test_validate {