Merge pull request #7 from saethlin/fmt

Format, fix features, fix a test

Author: cbeuw

abi/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "abi"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

difftest/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "difftest"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

difftest/src/lib.rs

@@ -1,5 +1,4 @@
 #![feature(iter_intersperse)]
-#![feature(let_chains)]
 
 pub mod backends;
 

difftest/src/main.rs

@@ -1,7 +1,13 @@
 #![feature(iter_intersperse)]
 
 use core::panic;
-use std::{collections::HashMap, io::{self, Read}, path::PathBuf, process::ExitCode, str::FromStr};
+use std::{
+    collections::HashMap,
+    io::{self, Read},
+    path::PathBuf,
+    process::ExitCode,
+    str::FromStr,
+};
 
 use clap::{Arg, Command};
 use config::Config;
@@ -88,7 +94,9 @@ fn main() -> ExitCode {
 
     let source = if source == "-" {
         let mut code = String::new();
-        io::stdin().read_to_string(&mut code).expect("can read source code from stdin");
+        io::stdin()
+            .read_to_string(&mut code)
+            .expect("can read source code from stdin");
         Source::Stdin(code)
     } else {
         Source::File(PathBuf::from_str(source).expect("is valid path"))
@@ -111,10 +119,7 @@ fn main() -> ExitCode {
         ExitCode::SUCCESS
     } else {
         let results = results.to_string();
-        error!(
-            "{} didn't pass:\n{results}",
-            source,
-        );
+        error!("{} didn't pass:\n{results}", source,);
         ExitCode::FAILURE
     }
 }

generate/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "generate"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

generate/src/generation/mod.rs

@@ -495,6 +495,7 @@ impl GenerationCtx {
         local
     }
 
+    #[allow(dead_code)]
     fn generate_storage_live(&self) -> Result<Statement> {
         let local = self
             .current_decls()
@@ -505,6 +506,7 @@ impl GenerationCtx {
         Ok(Statement::StorageLive(local))
     }
 
+    #[allow(dead_code)]
     fn generate_storage_dead(&self) -> Result<Statement> {
         let local = self
             .current_decls()
@@ -515,6 +517,7 @@ impl GenerationCtx {
         Ok(Statement::StorageDead(local))
     }
 
+    #[allow(dead_code)]
     fn generate_deinit(&self) -> Result<Statement> {
         let place = PlaceSelector::for_operand(self.tcx.clone())
             .into_iter_place(&self.pt)
@@ -523,6 +526,7 @@ impl GenerationCtx {
         Ok(Statement::Deinit(place))
     }
 
+    #[allow(dead_code)]
     fn generate_set_discriminant(&self) -> Result<Statement> {
         let enum_tys: Vec<TyId> = self
             .tcx

generate/src/main.rs

@@ -2,7 +2,6 @@
 #![feature(iter_advance_by)]
 #![feature(variant_count)]
 #![feature(test)]
-#![feature(let_chains)]
 #![feature(try_blocks)]
 #![feature(box_patterns)]
 

generate/src/mem/mod.rs

@@ -73,6 +73,7 @@ impl Run {
         }
     }
 
+    #[allow(dead_code)]
     pub fn size(&self) -> Size {
         Size::from_bytes(self.bytes.len())
     }
@@ -235,6 +236,7 @@ struct Allocation {
     live: bool,
 }
 
+#[allow(dead_code)]
 impl Allocation {
     fn runs_and_sizes(&self) -> impl Iterator<Item = (RunId, Size)> + '_ {
         self.runs
@@ -322,6 +324,7 @@ impl RunPointer {
         self.run_and_offset.1
     }
 
+    #[allow(dead_code)]
     pub fn len(&self) -> Size {
         self.size
     }

generate/src/pgraph.rs

@@ -208,6 +208,7 @@ impl PlaceGraph {
 
     /// Returns whether the selection of function call arguments will not cause
     /// UB. Must be called while we are still in the Caller
+    #[allow(dead_code)]
     pub fn arguments_ok(&self, args: &[Operand], return_dest: &Place) -> bool {
         // Check if the move of any places would invalidate any reference
         let mut ok = true;
@@ -1142,6 +1143,7 @@ impl PlaceGraph {
         }
     }
 
+    #[allow(dead_code)]
     pub fn place_count(&self) -> usize {
         self.places.node_count()
     }
@@ -1564,8 +1566,8 @@ mod tests {
                 root_ty,     // (i8, (i16, i32), i64)
                 TyCtxt::I8,  // i8
                 b_ty,        // (i16, 132)
-                TyCtxt::I16, // i16
                 TyCtxt::I32, // i32
+                TyCtxt::I16, // i16
                 TyCtxt::I64, // i64
             ]
         );

mir/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mir"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html