Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert toolchain to 1.69 because upstream bug on wasmer for macOS M CPUs #103

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions crates/cli/src/tasks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was unstable in 1.69

.map(|exports| exports.iter().any(check_export))
.unwrap_or(false)
}
1 change: 0 additions & 1 deletion crates/core/src/host/instance_env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed because have not effect in both toolchains

pub fn iter(&self, table_id: u32) -> impl Iterator<Item = Result<Vec<u8>, NodesError>> {
use genawaiter::{sync::gen, yield_, GeneratorState};

Expand Down
2 changes: 0 additions & 2 deletions crates/core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![allow(clippy::let_with_type_underscore)] // can remove once tokio-rs/tracing#2609 mereges
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed because have not effect in both toolchains


use std::path::{Path, PathBuf};

use once_cell::sync::Lazy;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.70"
channel = "1.69"
profile = "default"
targets = ["wasm32-unknown-unknown"]