Merge pull request #306 from Pat-Lafon/main

bril2json clippy fix && Note LLVM version
sampsyo · Dec 15, 2023 · 3413310 · 3413310
2 parents daaff28 + 4a1c782
commit 3413310
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/bril-rs/bril2json/Cargo.toml b/bril-rs/bril2json/Cargo.toml
@@ -16,7 +16,7 @@ keywords = ["compiler", "bril", "parser", "data-structures", "language"]
 [dependencies]
 clap         = { version = "4.4", features = ["derive"] }
 lalrpop-util = { version = "0.20", features = ["lexer"] }
-regex = "1.9"
+regex = "1.10"
 
 # Add a build-time dependency on the lalrpop library:
 [build-dependencies]

diff --git a/bril-rs/bril2json/src/bril_grammar.lalrpop b/bril-rs/bril2json/src/bril_grammar.lalrpop
@@ -17,6 +17,7 @@
 #![allow(clippy::match_same_arms)]
 #![allow(clippy::option_if_let_else)]
 #![allow(clippy::extra_unused_lifetimes)]
+#![allow(clippy::needless_raw_string_hashes)]
 
 use std::str::FromStr;
 use std::path::PathBuf;

diff --git a/bril-rs/brillvm/README.md b/bril-rs/brillvm/README.md
@@ -1,5 +1,12 @@
 # Brillvm
 
+## Requirements
+
+You should probably have the expected LLVM version for this tool to work. In
+general, that is a moving target and is specified in the `Cargo.toml` by the
+feature flag used for `Inkwell`, the safe LLVM/Rust bindings. This version will
+be updated as Inkwell gets new support, within the constraints of the rust compiler.
+
 ## Runtime
 
 You must have a linkable runtime library available in the LLVM bc format. You can get this by calling `make rt`