Updgrade to edition 2024

Author: morr0ne

Cargo.toml

@@ -4,7 +4,7 @@ members = ["cli"]
 [package]
 name = "libcorn"
 version = "0.10.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 description = "Parsing engine for Corn, a simple and pain-free configuration language."
 repository = "https://github.com/JakeStanger/corn"

benches/serde.rs

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use paste::paste;
 use serde::Deserialize;
 use std::hint::black_box;

cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "corn-cli"
 version = "0.10.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 description = "CLI for Corn. A simple and pain-free configuration language."
 repository = "https://github.com/corn-config/corn"

cli/src/main.rs

@@ -1,4 +1,4 @@
-use corn::{parse, BorrowedValue};
+use corn::{BorrowedValue, parse};
 use std::io::Read;
 use std::process::exit;
 use std::{fs, io};
@@ -7,7 +7,7 @@ use clap::{Parser, ValueEnum};
 use colored::Colorize;
 
 mod error;
-use error::{print_err, Error, ExitCode};
+use error::{Error, ExitCode, print_err};
 
 #[derive(ValueEnum, Clone, Copy, Debug)]
 enum OutputType {

src/ast.rs

@@ -1,4 +1,4 @@
-use crate::{lexer::StringPart, Integer};
+use crate::{Integer, lexer::StringPart};
 use alloc::vec::Vec;
 
 #[cfg(not(feature = "std"))]

src/de.rs

@@ -7,10 +7,10 @@ use alloc::{
 use serde::de::{self, IntoDeserializer};
 
 use crate::{
+    BorrowedObject, BorrowedValue, Error, IndexMap, Result,
     ast::{Entry, EntryOrSpread, Inputs, PairOrSpread, Root},
     lexer::{Lexer, StringPart},
     parser::RootParser,
-    BorrowedObject, BorrowedValue, Error, IndexMap, Result,
 };
 
 /// A structure that deserializes Corn configuration values.
@@ -247,10 +247,10 @@ impl<'de> Deserializer<'de> {
         inputs: &Inputs<'input>,
     ) -> Result<BorrowedValue<'input>> {
         #[cfg(feature = "std")]
-        if let Some(env) = input.strip_prefix("env_") {
-            if let Ok(env) = std::env::var(env) {
-                return Ok(BorrowedValue::String(Cow::Owned(env)));
-            }
+        if let Some(env) = input.strip_prefix("env_")
+            && let Ok(env) = std::env::var(env)
+        {
+            return Ok(BorrowedValue::String(Cow::Owned(env)));
         }
 
         if let Some(entry) = inputs.get(input) {

src/lexer.rs

@@ -215,11 +215,11 @@ fn parse_literal<'input>(
                 let slice = string_lex.slice();
                 let hex_part = &slice[3..slice.len() - 1];
 
-                if let Ok(code) = u32::from_str_radix(hex_part, 16) {
-                    if let Some(unicode_char) = char::from_u32(code) {
-                        current_literal.push(unicode_char);
-                        continue;
-                    }
+                if let Ok(code) = u32::from_str_radix(hex_part, 16)
+                    && let Some(unicode_char) = char::from_u32(code)
+                {
+                    current_literal.push(unicode_char);
+                    continue;
                 }
 
                 current_literal.push('\u{FFFD}');

src/lib.rs

@@ -27,6 +27,6 @@ pub mod ast;
 pub mod lexer;
 lalrpop_util::lalrpop_mod!(pub parser, "/corn.rs");
 
-pub use de::{from_str, parse, Deserializer};
+pub use de::{Deserializer, from_str, parse};
 pub use error::{Error, Result};
 pub use value::{BorrowedObject, BorrowedValue, Integer, Object, Value};

src/value/de.rs

@@ -1,5 +1,5 @@
 use alloc::{string::String, vec::Vec};
-use serde::{de::Visitor, Deserialize};
+use serde::{Deserialize, de::Visitor};
 
 use crate::{Object, Value};
 

src/value/integer.rs

@@ -1,8 +1,9 @@
 use core::fmt::{Debug, Display};
 
 use serde::{
+    Deserialize, Serialize,
     de::{self, Visitor},
-    forward_to_deserialize_any, Deserialize, Serialize,
+    forward_to_deserialize_any,
 };
 
 use crate::Error;