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

Update Rust to v1.76 and fix warnings #1716

Merged
merged 3 commits into from
Mar 11, 2024
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
test-64bits:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
Expand All @@ -39,7 +39,7 @@ jobs:
test-32bits:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- run: apt-get update && apt install -y libc6-dev-i386
- uses: actions/checkout@v4
Expand All @@ -50,7 +50,7 @@ jobs:
wasm-node-check:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- run: rustup target add wasm32-unknown-unknown
Expand All @@ -66,7 +66,7 @@ jobs:
check-features:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
check-no-std:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- run: rustup target add thumbv7m-none-eabi
Expand All @@ -112,7 +112,7 @@ jobs:
check-rustdoc-links:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
Expand All @@ -121,7 +121,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
# Checks `rustfmt` formatting
- uses: actions/checkout@v4
Expand All @@ -135,7 +135,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
# Since build artifacts are specific to a nightly version, we pin the specific nightly
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
wasm-node-versions-match:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- run: apt-get update && apt install -y jq
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
build-js-doc:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -83,7 +83,7 @@ jobs:
build-rust-doc:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -104,7 +104,7 @@ jobs:
build-tests-coverage:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- run: apt update && apt install -y jq
- run: rustup component add llvm-tools-preview
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
npm-publish:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- run: rustup target add wasm32-unknown-unknown
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
# Ideally we don't want to install any toolchain, but the GH action doesn't support this.
toolchain: 1.74
toolchain: 1.76
profile: minimal
- uses: Swatinem/rust-cache@v2
- id: compute-tag # Compute the tag that we might push.
Expand All @@ -244,7 +244,7 @@ jobs:
crates-io-publish:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
- run: cargo publish --dry-run --locked
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/periodic-cargo-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
cargo-update:
runs-on: ubuntu-latest
container:
image: rust:1.74
image: rust:1.76
steps:
- uses: actions/checkout@v4
# Note: `cargo update --workspace` doesn't seem to have any effect.
Expand Down
2 changes: 1 addition & 1 deletion full-node/src/database_thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use smol::{channel, lock::Mutex, stream::StreamExt as _};
use smoldot::database::full_sqlite::SqliteFullDatabase;
use std::{pin::pin, thread};

pub use smoldot::database::full_sqlite::{CorruptedError, StorageAccessError};
pub use smoldot::database::full_sqlite::StorageAccessError;

/// Handle to the thread were the database accesses are performed.
///
Expand Down
2 changes: 0 additions & 2 deletions light-base/src/sync_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ use smoldot::{
mod parachain;
mod standalone;

pub use network_service::EncodedMerkleProof;

/// Configuration for a [`SyncService`].
pub struct Config<TPlat: PlatformRef> {
/// Name of the chain, for logging purposes.
Expand Down
4 changes: 4 additions & 0 deletions wasm-node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Changed

- Smoldot is no longer compiled with the `bulk-memory-operations` and `sign-extensions-ops` WebAssembly features enabled due to the Rust compiler considering target features as unstable. ([#1716](https://github.com/smol-dot/smoldot/pull/1716))

## 2.0.22 - 2024-03-04

### Fixed
Expand Down
19 changes: 4 additions & 15 deletions wasm-node/javascript/prepare.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,14 @@ if (buildProfile != 'debug' && buildProfile != 'min-size-release')

// The important step in this script is running `cargo build --target wasm32-unknown-unknown` on
// the Rust code. This generates a `wasm` file in `target/wasm32-unknown-unknown`.
// Some optional Wasm features are enabled during the compilation in order to speed up the
// execution of smoldot.
// SIMD is intentionally not enabled, because WASM engines seem to allow only SIMD instructions
// on specific hardware. See for example <https://bugzilla.mozilla.org/show_bug.cgi?id=1625130#c11>
// No optional Wasm features is enabled due to being an unstable part of the Rust compiler.
// Additionally, SIMD should not be enabled, because WASM engines seem to allow only SIMD
// instructions on specific hardware. See for example <https://bugzilla.mozilla.org/show_bug.cgi?id=1625130#c11>
// and <https://bugzilla.mozilla.org/show_bug.cgi?id=1840710>.
//
// Note that this doesn't enable these features in the Rust standard library (which comes
// precompiled), but the missing optimizations shouldn't be too much of a problem. The Rust
// standard library could be compiled with these features using the `-Z build-std` flag, but at
// the time of the writing of this comment this would require an unstable version of Rust.
// Use `rustc --print target-features --target wasm32-unknown-unknown` to see the list of target
// features.
// See <https://webassembly.org/roadmap/> to know which version of which engine supports which
// feature.
// See also the issue: <https://github.com/smol-dot/smoldot/issues/350>
child_process.execSync(
"cargo build --package smoldot-light-wasm --target wasm32-unknown-unknown --no-default-features " +
(buildProfile == 'debug' ? '' : ("--profile " + buildProfile)),
{ 'stdio': 'inherit', 'env': { 'RUSTFLAGS': '-C target-feature=+bulk-memory,+sign-ext', ...process.env } }
{ 'stdio': 'inherit' }
);
const rustOutput = "../../target/wasm32-unknown-unknown/" + buildProfile + "/smoldot_light_wasm.wasm";

Expand Down
Loading