chore: merge branch 'main' into feat/versioning

thalo-rs · Mar 27, 2022 · 2f8400c · 2f8400c
2 parents ff217f1 + 0080411
commit 2f8400c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 handlebars = { version = "4.2", optional = true }
 heck = { version = "0.4", optional = true }
 nom = { version = "7.1", features = ["alloc"] }
-nom-supreme = "0.6"
+nom-supreme = { version = "0.7", features = ["error"] }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 wit-parser = { git = "https://github.com/bytecodealliance/wit-bindgen", optional = true }

diff --git a/examples/bank-account-wasm/Cargo.lock b/examples/bank-account-wasm/Cargo.lock
diff --git a/src/codegen/compiler/rust.rs b/src/codegen/compiler/rust.rs
@@ -445,7 +445,6 @@ impl RustTypeDerives for Scalar {
             Scalar::Float => HashSet::from_iter([
                 Clone,
                 Copy,
-                Hash,
                 Debug,
                 Default,
                 PartialEq,