Merge pull request #298 from Pat-Lafon/main

Rust 1.73 updates

bril-rs/bril2json/Cargo.toml

@@ -14,7 +14,7 @@ keywords = ["compiler", "bril", "parser", "data-structures", "language"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap         = { version = "4.3", features = ["derive"] }
+clap         = { version = "4.4", features = ["derive"] }
 lalrpop-util = { version = "0.20", features = ["lexer"] }
 regex = "1.9"
 

bril-rs/bril2json/src/bril_grammar.lalrpop

@@ -16,6 +16,7 @@
 #![allow(clippy::uninlined_format_args)]
 #![allow(clippy::match_same_arms)]
 #![allow(clippy::option_if_let_else)]
+#![allow(clippy::extra_unused_lifetimes)]
 
 use std::str::FromStr;
 use std::path::PathBuf;

bril-rs/brild/Cargo.toml

@@ -13,7 +13,7 @@ keywords = ["compiler", "bril", "parser", "data-structures", "language"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap         = { version = "4.3", features = ["derive"] }
+clap         = { version = "4.4", features = ["derive"] }
 thiserror    = "1.0"
 
 [dependencies.bril2json]

bril-rs/brillvm/Cargo.toml

@@ -15,7 +15,7 @@ default-run = "main"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.3", features = ["derive"] }
+clap = { version = "4.4", features = ["derive"] }
 inkwell = { version = "0.2", features = ["llvm16-0"] }
 libc-print = "0.1"
 

bril-rs/brillvm/src/llvm.rs

@@ -141,7 +141,7 @@ impl Fresh {
 fn build_op<'a, 'b>(
     context: &'a Context,
     builder: &'a Builder,
-    heap: &mut Heap<'a, 'b>,
+    heap: &Heap<'a, 'b>,
     fresh: &mut Fresh,
     op: impl Fn(Vec<BasicValueEnum<'a>>) -> BasicValueEnum<'a>,
     args: &'b [String],
@@ -160,7 +160,7 @@ fn build_op<'a, 'b>(
 fn build_effect_op<'a, 'b>(
     context: &'a Context,
     builder: &'a Builder,
-    heap: &mut Heap<'a, 'b>,
+    heap: &Heap<'a, 'b>,
     fresh: &mut Fresh,
     op: impl Fn(Vec<BasicValueEnum<'a>>),
     args: &'b [String],
@@ -190,7 +190,7 @@ fn build_instruction<'a, 'b>(
     context: &'a Context,
     module: &'a Module,
     builder: &'a Builder,
-    heap: &mut Heap<'a, 'b>,
+    heap: &Heap<'a, 'b>,
     block_map: &mut HashMap<String, BasicBlock<'a>>,
     llvm_func: FunctionValue<'a>,
     fresh: &mut Fresh,
@@ -1247,7 +1247,7 @@ pub fn create_module_from_program<'a>(
     // Now actually build each function
     funcs
         .into_iter()
-        .for_each(|(llvm_func, instrs, mut block, mut heap)| {
+        .for_each(|(llvm_func, instrs, mut block, heap)| {
             let mut last_instr = None;
 
             // If their are actually instructions, proceed
@@ -1284,7 +1284,7 @@ pub fn create_module_from_program<'a>(
                                 context,
                                 &runtime_module,
                                 &builder,
-                                &mut heap,
+                                &heap,
                                 &mut block_map,
                                 llvm_func,
                                 &mut fresh,
@@ -1375,7 +1375,7 @@ pub fn create_module_from_program<'a>(
         build_effect_op(
             context,
             &builder,
-            &mut heap,
+            &heap,
             &mut fresh,
             |v| {
                 builder.build_call(

bril-rs/rs2bril/Cargo.toml

@@ -16,7 +16,7 @@ keywords = ["compiler", "bril", "parser", "data-structures", "language"]
 [dependencies]
 syn = {version = "2.0", features = ["full", "extra-traits"]}
 proc-macro2 = {version = "1.0", features = ["span-locations"]}
-clap         = { version = "4.3", features = ["derive"] }
+clap         = { version = "4.4", features = ["derive"] }
 
 [dependencies.bril-rs]
 version = "0.1.0"

brilirs/Cargo.toml

@@ -8,29 +8,34 @@ readme = "README.md"
 repository = "https://github.com/sampsyo/bril"
 # license = "MIT"
 license-file = "../LICENSE"
-categories = ["command-line-utilities", "compilers", "data-structures", "parser-implementations"]
+categories = [
+    "command-line-utilities",
+    "compilers",
+    "data-structures",
+    "parser-implementations",
+]
 keywords = ["compiler", "bril", "interpreter", "data-structures", "language"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [build-dependencies]
-clap         = { version = "4.3", features = ["derive"] }
-clap_complete= { version = "4.3", optional = true }
+clap = { version = "4.4", features = ["derive"] }
+clap_complete = { version = "4.4", optional = true }
 
 [dependencies]
-thiserror    = "1.0"
-clap         = { version = "4.3", features = ["derive"] }
-fxhash       = "0.2"
-mimalloc     = "0.1"
-itoa         = "1.0"
+thiserror = "1.0"
+clap = { version = "4.4", features = ["derive"] }
+fxhash = "0.2"
+mimalloc = "0.1"
+itoa = "1.0"
 
 [dependencies.bril-rs]
-version      = "0.1.0"
-path         = "../bril-rs"
-features     = ["ssa", "memory", "float", "speculate", "char"]
+version = "0.1.0"
+path = "../bril-rs"
+features = ["ssa", "memory", "float", "speculate", "char"]
 
 [dependencies.bril2json]
-version      = "0.1.0"
-path         = "../bril-rs/bril2json"
+version = "0.1.0"
+path = "../bril-rs/bril2json"
 
 [profile.release]
 # this can shave off a few ms but doubles the build time so it's not really worth it

brilirs/src/interp.rs

@@ -816,7 +816,7 @@ pub fn execute_main<T: std::io::Write, U: std::io::Write>(
     writeln!(profiling_out, "total_dyn_inst: {}", state.instruction_count)
       // We call flush here in case `profiling_out` is a https://doc.rust-lang.org/std/io/struct.BufWriter.html
       // Otherwise we would expect this flush to be a nop.
-      .and_then(|_| profiling_out.flush())
+      .and_then(|()| profiling_out.flush())
       .map_err(InterpError::IoError)?;
   }