Rust 2024 Edition

Signed-off-by: Isaac Marovitz <[email protected]>

Author: IsaacMarovitz

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pe-parser"
 version = "0.7.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Isaac Marovitz <[email protected]>"]
 description = "A blazing fast PE Parser with pretty print"

fuzz/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pe-parser-fuzz"
 version = "0.0.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [package.metadata]
 cargo-fuzz = true

src/main.rs

@@ -30,42 +30,44 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             .help("Print section table"))
         .get_matches();
 
-    if let Some(file) = matches.get_one::<String>("file") {
-        const VERSION: &str = env!("CARGO_PKG_VERSION");
-        println!("PE Parser - Version {}", VERSION);
-        println!("=========================\n");
-
-        let binary = fs::read(file)
-            .expect("Failed to read file");
-    
-        let pe = parse_portable_executable(binary.as_slice())
-            .expect("Failed to parse Portable Executable!");
+    match matches.get_one::<String>("file") { 
+        Some(file) => {
+            const VERSION: &str = env!("CARGO_PKG_VERSION");
+            println!("PE Parser - Version {}", VERSION);
+            println!("=========================\n");
 
-        if matches.get_flag("all") {
-            print!("{}", pe);
-        } else {
-            if matches.get_flag("coff") {
-                println!("{}", pe.coff);
-            }
-
-            if matches.get_flag("optional") {
-                if let Some(optional) = pe.optional_header_32 {
-                    println!("{}", optional);
+            let binary = fs::read(file)
+                .expect("Failed to read file");
+        
+            let pe = parse_portable_executable(binary.as_slice())
+                .expect("Failed to parse Portable Executable!");
+        
+            if matches.get_flag("all") {
+                print!("{}", pe);
+            } else {
+                if matches.get_flag("coff") {
+                    println!("{}", pe.coff);
                 }
-
-                if let Some(optional) = pe.optional_header_64 {
-                    println!("{}", optional);
+    
+                if matches.get_flag("optional") {
+                    if let Some(optional) = pe.optional_header_32 {
+                        println!("{}", optional);
+                    }
+    
+                    if let Some(optional) = pe.optional_header_64 {
+                        println!("{}", optional);
+                    }
                 }
-            }
-
-            if matches.get_flag("section") {
-                for section in pe.section_table.iter() {
-                    println!("{}", section);
+    
+                if matches.get_flag("section") {
+                    for section in pe.section_table.iter() {
+                        println!("{}", section);
+                    }
                 }
             }
+        } _ => {
+            println!("No PE file passed to parse!");
         }
-    } else {
-        println!("No PE file passed to parse!");
     };
 
     Ok(())