Migrating from 2021 edition to 2024 v3

.github/workflows/TestingCI.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Fetch
         run: cargo fetch
       - name: Build
-        run: cargo build --release --verbose
+        run: RUSTFLAGS='-D warnings' cargo build --release --verbose
       - name: Run tests
         run: cargo test --release --verbose
       - name: Run fmt check
@@ -42,6 +42,6 @@ jobs:
       - name: Fetch
         run: cargo fetch
       - name: Build
-        run: cargo build --release --verbose
+        run: RUSTFLAGS='-D warnings' cargo build --release --verbose
       - name: Run tests
         run: cargo test --release --verbose

Cargo.toml

@@ -32,8 +32,8 @@ members = [
 [workspace.package]
 repository = "https://github.com/rustcoreutils/posixutils-rs"
 license = "MIT"
-edition = "2021"
-rust-version = "1.84.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
@@ -44,5 +44,5 @@ gettext-rs = { path = "./gettext-rs" }
 errno = "0.3"
 chrono-tz = "0.10"
 
-[workspace.lints]
-
+[workspace.lints.rust]
+rust-2024-compatibility = "warn"

awk/compiler.rs

@@ -15,10 +15,10 @@ use crate::program::{
 };
 use crate::regex::Regex;
 
+use pest::Parser;
 use pest::error::InputLocation;
 use pest::iterators::{Pair, Pairs};
 use pest::pratt_parser::{Assoc, Op, PrattParser};
-use pest::Parser;
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::ffi::CString;
@@ -704,13 +704,13 @@ impl Compiler {
                         return Err(pest_error_from_span(
                             span,
                             format!("'{}' is not a function", name),
-                        ))
+                        ));
                     }
                     None => {
                         return Err(pest_error_from_span(
                             span,
                             format!("call to undefined function '{}'", name),
-                        ))
+                        ));
                     }
                 }
                 Ok(Expr::new(ExprKind::Number, instructions))

awk/interpreter/array.rs

@@ -8,7 +8,7 @@
 //
 
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     rc::Rc,
 };
 

awk/interpreter/io.rs

@@ -9,7 +9,7 @@
 
 use core::panic;
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     ffi::CString,
     fs::File,
     io::{BufReader, Bytes, Read, Write},
@@ -43,13 +43,13 @@ impl TryFrom<AwkString> for RecordSeparator {
 type ReadResult = Result<u8, String>;
 
 macro_rules! read_iter_next {
-    ($iter:expr, $ret:expr) => {
+    ($iter:expr_2021, $ret:expr_2021) => {
         match $iter.next() {
             Some(byte_result) => byte_result?,
             None => return $ret,
         }
     };
-    ($iter:expr) => {
+    ($iter:expr_2021) => {
         read_iter_next!($iter, Ok(None))
     };
 }