feat!: update to rust 1.74 and edition 2021

lccc-project · Apr 23, 2024 · e1f9ab5 · e1f9ab5
1 parent 4665334
commit e1f9ab5
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 27 deletions.
diff --git a/ar/Cargo.toml b/ar/Cargo.toml
@@ -2,7 +2,8 @@
 name = "lcar"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/arch-ops/Cargo.toml b/arch-ops/Cargo.toml
@@ -3,8 +3,8 @@ name = "arch-ops"
 version = "0.1.0"
 authors = ["Connor Horman <chorman@lcdev.xyz>", "rdrpenguin"]
 description = "A library to encode and decode instructions for several architectures"
-edition = "2018"
-rust-version = "1.56"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/arch-ops/src/clever.rs b/arch-ops/src/clever.rs
@@ -1,5 +1,4 @@
 use std::{
-    convert::TryFrom,
     io::{ErrorKind, Read, Write},
     ops::{Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive},
 };
@@ -1058,7 +1057,7 @@ macro_rules! nop_instructions{
 nop_instructions!(NOP0: Nop10, NOP1: Nop11, NOP2: Nop12, NOP3: Nop13);
 
 macro_rules! print_h_field{
-    [$(($enum:ident {$($h:pat,)* $(, ..)?} => |$fmt:pat| $e:expr)),* $(,)?] => {
+    [$(($enum:ident {$($h:pat,)* $(, ..)?} => |$fmt:pat_param| $e:expr)),* $(,)?] => {
         impl core::fmt::Display for CleverOpcode{
             fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result{
                 f.write_str(self.name())?;
@@ -1533,7 +1532,7 @@ impl CleverInstruction {
 
 impl core::fmt::Display for CleverInstruction {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        self.opcode().fmt(f)?;
+        write!(f, "{:?}", self.opcode())?;
 
         match self.opcode().operands() {
             CleverOperandKind::Size => {

diff --git a/arch-ops/src/holeybytes/mod.rs b/arch-ops/src/holeybytes/mod.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, str::FromStr};
+use std::str::FromStr;
 
 pub mod codec;
 

diff --git a/binfmt-test/Cargo.toml b/binfmt-test/Cargo.toml
@@ -2,8 +2,9 @@
 name = "binfmt-test"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
 license = "BSD-2-Clause-Patent"
+rust-version = "1.74"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/binfmt/Cargo.toml b/binfmt/Cargo.toml
@@ -3,7 +3,8 @@ name = "binfmt"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>", "Ray Redondo <rdrpenguin04@gmail.com>"]
 description = "A library for reading and writing binaries"
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/binfmt/src/ar.rs b/binfmt/src/ar.rs
@@ -1,5 +1,4 @@
 use std::{
-    convert::TryFrom,
     error::Error,
     ffi::{CString, OsStr, OsString},
     fmt::Display,

diff --git a/binfmt/src/elf32/w65.rs b/binfmt/src/elf32/w65.rs
@@ -1,7 +1,5 @@
 use crate::howto::{HowTo, HowToError};
 
-use std::convert::TryFrom;
-
 use super::consts;
 
 #[non_exhaustive]

diff --git a/binfmt/src/traits.rs b/binfmt/src/traits.rs
@@ -2,14 +2,10 @@ use bytemuck::Pod;
 
 use crate::traits::private::Sealed;
 use core::{
-    convert::TryInto,
     fmt::{Debug, LowerHex},
     ops::*,
 };
-use std::{
-    convert::TryFrom,
-    io::{Read, Seek},
-};
+use std::io::{Read, Seek};
 
 #[doc(hidden)]
 pub(crate) mod private {

diff --git a/binfmt/src/xir.rs b/binfmt/src/xir.rs
@@ -2,7 +2,6 @@
 
 use core::{
     char::CharTryFromError,
-    convert::TryFrom,
     ops::{Deref, DerefMut, Index, IndexMut},
     slice::SliceIndex,
 };

diff --git a/clippy.toml b/clippy.toml
@@ -1 +1 @@
-msrv = "1.54"
+msrv = "1.74"
diff --git a/dbg-info/Cargo.toml b/dbg-info/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "dbg-info"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/lcas/Cargo.toml b/lcas/Cargo.toml
@@ -2,7 +2,8 @@
 name = "lcas-core"
 version = "0.1.0"
 authors = ["Connor <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/lccc-mangle/Cargo.toml b/lccc-mangle/Cargo.toml
@@ -2,7 +2,8 @@
 name = "xlang-mangle"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/lcld/Cargo.toml b/lcld/Cargo.toml
@@ -2,7 +2,8 @@
 name = "lcld"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>", "Ray Redondo <rdrpenguin04@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 build = "build/main.rs"
 

diff --git a/lto/Cargo.toml b/lto/Cargo.toml
@@ -2,8 +2,9 @@
 name = "lto"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
 license = "BSD-2-Clause-Patent"
+rust-version = "1.74"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/m4/lcrust_prog_rustc.m4 b/m4/lcrust_prog_rustc.m4
@@ -466,7 +466,8 @@ AC_DEFUN([LCRUST_PROG_CARGO],[
 [package]
 name = "cargotest"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/objdump/Cargo.toml b/objdump/Cargo.toml
@@ -2,7 +2,8 @@
 name = "objdump"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/readobj/Cargo.toml b/readobj/Cargo.toml
@@ -2,7 +2,8 @@
 name = "readobj"
 version = "0.1.0"
 authors = ["Connor Horman <chorman64@gmail.com>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.74"
 license = "BSD-2-Clause-Patent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html