Fix rebase errors

CosmWasm · Jan 23, 2024 · 7f96692 · 7f96692
1 parent 8093926
commit 7f96692
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/packages/std/src/errors/std_error.rs b/packages/std/src/errors/std_error.rs
@@ -765,10 +765,8 @@ mod tests {
 
     #[test]
     fn from_std_str_utf8error_works() {
-        let broken = b"Hello \xF0\x90\x80World";
-        #[allow(unknown_lints)]
-        #[allow(invalid_from_utf8)]
-        let error: StdError = str::from_utf8(broken).unwrap_err().into();
+        let broken = Vec::from(b"Hello \xF0\x90\x80World" as &[u8]);
+        let error: StdError = str::from_utf8(&broken).unwrap_err().into();
         match error {
             StdError::InvalidUtf8 { msg, .. } => {
                 assert_eq!(msg, "invalid utf-8 sequence of 3 bytes from index 6")

diff --git a/packages/vm/src/modules/mod.rs b/packages/vm/src/modules/mod.rs
@@ -5,7 +5,7 @@ mod pinned_memory_cache;
 mod versioning;
 
 pub use cached_module::CachedModule;
-pub use file_system_cache::{FileSystemCache, NewFileSystemCacheError};
+pub use file_system_cache::FileSystemCache;
 pub use in_memory_cache::InMemoryCache;
 pub use pinned_memory_cache::PinnedMemoryCache;
 pub use versioning::current_wasmer_module_version;
diff --git a/packages/vm/src/wasm_backend/mod.rs b/packages/vm/src/wasm_backend/mod.rs
@@ -5,4 +5,3 @@ mod limiting_tunables;
 
 pub use compile::compile;
 pub use engine::{make_compiling_engine, make_runtime_engine};
-pub use limiting_tunables::LimitingTunables;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ mod limiting_tunables;

		pub use compile::compile;
		pub use engine::{make_compiling_engine, make_runtime_engine};
		pub use limiting_tunables::LimitingTunables;