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.

Sign up for GitHub

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

Jump to bottom

Update to Rust 1.82 #1990

Merged
merged 5 commits into from
Nov 7, 2024
Merged

Update to Rust 1.82 #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbcfa5d
Update to Rust 1.82
tomaka Oct 18, 2024
5e93329
Use Box instead of Vec when reading buffer
tomaka Oct 18, 2024
7961b9d
Forgot one version update
tomaka Oct 18, 2024
61a009a
Merge branch 'main' into rust-1.82
tomaka Oct 19, 2024
c950fc8
Merge branch 'main' into rust-1.82
tomaka Nov 7, 2024
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
View file
Open in desktop
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.81
image: rust:1.82
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.81
image: rust:1.82
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.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
- run: rustup target add wasm32-unknown-unknown
Expand All @@ -67,7 +67,7 @@ jobs:
check-features:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
check-no-std:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
- run: rustup target add thumbv7m-none-eabi
Expand All @@ -113,7 +113,7 @@ jobs:
check-rustdoc-links:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2
Expand All @@ -122,7 +122,7 @@ jobs:
fmt:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
# Checks `rustfmt` formatting
- uses: actions/checkout@v4
Expand All @@ -136,7 +136,7 @@ jobs:
clippy:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
# Since build artifacts are specific to a nightly version, we pin the specific nightly
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
wasm-node-versions-match:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
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
View file
Open in desktop
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.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -83,7 +83,7 @@ jobs:
build-rust-doc:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -104,7 +104,7 @@ jobs:
build-tests-coverage:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
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.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
- run: rustup target add wasm32-unknown-unknown
Expand Down Expand Up @@ -218,7 +218,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.81
toolchain: 1.82
profile: minimal
- uses: Swatinem/rust-cache@v2
- id: compute-tag # Compute the tag that we might push.
Expand All @@ -245,7 +245,7 @@ jobs:
crates-io-publish:
runs-on: ubuntu-latest
container:
image: rust:1.81
image: rust:1.82
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
View file
Open in desktop
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.81
image: rust:1.82
steps:
- uses: actions/checkout@v4
# Note: `cargo update --workspace` doesn't seem to have any effect.
Expand Down
4 changes: 2 additions & 2 deletions lib/src/executor/host/tests/hash_algorithms.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern "C" {
fn ext_hashing_keccak_256_version_1(ptrsz: i64) -> i32;
}

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_param_ptr: i32, _param_sz: i32) -> i64 {
let slice = b"hello world";
let ptrsz = u64::from(slice.len() as u32) << 32 | u64::from(slice.as_ptr() as usize as u32);
Expand Down Expand Up @@ -77,7 +77,7 @@ macro_rules! gen_test {
fn ext_hashing_keccak_256_version_1(ptrsz: i64) -> i32;
}

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_param_ptr: i32, _param_sz: i32) -> i64 {
let slice = b"hello world";
let ptrsz = u64::from(slice.len() as u32) << 32 | u64::from(slice.as_ptr() as usize as u32);
Expand Down
14 changes: 7 additions & 7 deletions lib/src/executor/host/tests/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fn function_to_run_invalid_params() {
fn input_provided_correctly() {
/* Source code:

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_param_ptr: i32, _param_sz: i32) -> i64 {
let inparam: &[u8] = unsafe {
core::slice::from_raw_parts(
Expand Down Expand Up @@ -299,7 +299,7 @@ fn input_provided_correctly() {
fn large_input_provided_correctly() {
/* Source code:

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_param_ptr: i32, _param_sz: i32) -> i64 {
let inparam: &[u8] = unsafe {
core::slice::from_raw_parts(
Expand Down Expand Up @@ -413,7 +413,7 @@ fn return_value_works() {

static OUT: &[u8] = b"hello world";

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_: i32, _: i32) -> i64 {
let ptr = OUT.as_ptr() as usize as u32;
let sz = OUT.len() as u32;
Expand Down Expand Up @@ -482,7 +482,7 @@ fn return_value_works() {
fn bad_return_value() {
/* Source code:

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_: i32, _: i32) -> i32 {
0
}
Expand Down Expand Up @@ -546,7 +546,7 @@ fn bad_return_value() {
fn returned_ptr_out_of_range() {
/* Source code:

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_: i32, _: i32) -> i64 {
let ptr = 0xffff_fff0usize as u32;
let sz = 5 as u32;
Expand Down Expand Up @@ -613,7 +613,7 @@ fn returned_ptr_out_of_range() {
fn returned_size_out_of_range() {
/* Source code:

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_: i32, _: i32) -> i64 {
let ptr = 5 as u32;
let sz = 0xffff_fff0usize as u32;
Expand Down Expand Up @@ -683,7 +683,7 @@ fn unresolved_host_function_called() {
fn host_function_that_doesnt_exist();
}

#[no_mangle]
#[unsafe(no_mangle)]
extern "C" fn test(_: i32, _: i32) -> i64 {
unsafe {
host_function_that_doesnt_exist()
Expand Down
Loading
Loading