From 83e88d82f210e399ab9ea9e8236480f60aa93cef Mon Sep 17 00:00:00 2001
From: Mario Montoya <mamcx@elmalabarista.com>
Date: Thu, 27 Jul 2023 11:04:33 -0500
Subject: [PATCH] Revert toolchain to 1.69 because upstream bug on wasmer.
 Remove unnecesary lints (#103)

---
 crates/cli/src/tasks.rs              | 6 ++++--
 crates/core/src/host/instance_env.rs | 1 -
 crates/core/src/lib.rs               | 2 --
 rust-toolchain.toml                  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crates/cli/src/tasks.rs b/crates/cli/src/tasks.rs
index 4fd75cba17..3e7719a704 100644
--- a/crates/cli/src/tasks.rs
+++ b/crates/cli/src/tasks.rs
@@ -115,9 +115,11 @@ fn has_wasm_bindgen(module: &wasmbin::Module) -> bool {
     module
         .find_std_section::<wasmbin::sections::payload::Import>()
         .and_then(|imports| imports.try_contents().ok())
-        .is_some_and(|imports| imports.iter().any(check_import))
+        .map(|imports| imports.iter().any(check_import))
+        .unwrap_or(false)
         || module
             .find_std_section::<wasmbin::sections::payload::Export>()
             .and_then(|exports| exports.try_contents().ok())
-            .is_some_and(|exports| exports.iter().any(check_export))
+            .map(|exports| exports.iter().any(check_export))
+            .unwrap_or(false)
 }
diff --git a/crates/core/src/host/instance_env.rs b/crates/core/src/host/instance_env.rs
index 5ab73e670b..1002834b3d 100644
--- a/crates/core/src/host/instance_env.rs
+++ b/crates/core/src/host/instance_env.rs
@@ -386,7 +386,6 @@ impl InstanceEnv {
     }
 
     #[tracing::instrument(skip_all)]
-    #[allow(clippy::let_with_type_underscore)] // I have no idea why clippy is issuing this warning
     pub fn iter(&self, table_id: u32) -> impl Iterator<Item = Result<Vec<u8>, NodesError>> {
         use genawaiter::{sync::gen, yield_, GeneratorState};
 
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index 2cdae9c1f5..662194a817 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::let_with_type_underscore)] // can remove once tokio-rs/tracing#2609 mereges
-
 use std::path::{Path, PathBuf};
 
 use once_cell::sync::Lazy;
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 881513c504..1f0994cc1d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.70"
+channel = "1.69"
 profile = "default"
 targets = ["wasm32-unknown-unknown"]