Skip to content

Commit 0ba0876

Browse files
committed
Update edition to 2024 for all crates
1 parent f6a8d3d commit 0ba0876

10 files changed

Lines changed: 17 additions & 14 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[workspace]
22
resolver = "2"
33
members = ["app-sdk", "client-sdk", "ecalls", "macros", "common", "cargo-vnd", "riscv-arch-tests"]
4+
5+
[workspace.package]
6+
edition = "2024"

app-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "vanadium-app-sdk"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55

66
[dependencies]
77
common = { path = "../common", default-features = false }

app-sdk/src/ecalls_native.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ const SLIP21_MAGIC: &'static str = "Symmetric key seed";
4747

4848
const TICKER_MS: u64 = 100;
4949

50-
unsafe fn to_bigint(bytes: *const u8, len: usize) -> BigUint {
50+
unsafe fn to_bigint(bytes: *const u8, len: usize) -> BigUint { unsafe {
5151
let bytes = std::slice::from_raw_parts(bytes, len);
5252
BigUint::from_bytes_be(bytes)
53-
}
53+
}}
5454

55-
unsafe fn copy_result(r: *mut u8, result_bytes: &[u8], len: usize) -> () {
55+
unsafe fn copy_result(r: *mut u8, result_bytes: &[u8], len: usize) -> () { unsafe {
5656
if result_bytes.len() < len {
5757
std::ptr::write_bytes(r, 0, len - result_bytes.len());
5858
}
@@ -61,7 +61,7 @@ unsafe fn copy_result(r: *mut u8, result_bytes: &[u8], len: usize) -> () {
6161
r.add(len - result_bytes.len()),
6262
result_bytes.len(),
6363
);
64-
}
64+
}}
6565

6666
// This should be called in show_page if there is no action for the user after showing the page.
6767
fn epilogue_noaction() {

cargo-vnd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "cargo-vnd"
33
version = "0.1.0"
4-
edition = "2024"
4+
edition.workspace = true
55

66
[[bin]]
77
name = "cargo-vnd"

client-sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "vanadium-client-sdk"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55

66
[features]
77
default = ["cargo_toml", "transport", "target_all"]

client-sdk/src/vanadium_client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,19 +1751,19 @@ impl<E: std::fmt::Debug + Send + Sync + 'static> VanadiumAppClient<E> {
17511751
match engine.step().await {
17521752
Ok(Some(VAppResponse::Message(response))) => {
17531753
// We got a response - send it to the pending request
1754-
if let Some(resp_tx) = pending_response.take() {
1754+
match pending_response.take() { Some(resp_tx) => {
17551755
if resp_tx.send(Ok(response)).is_err() {
17561756
#[cfg(feature = "debug")]
17571757
log::debug!("Failed to send response: receiver dropped");
17581758
}
1759-
} else {
1759+
} _ => {
17601760
// Received a message without a pending request - this shouldn't happen
17611761
// in a strict message-response pattern
17621762
#[cfg(feature = "debug")]
17631763
log::debug!(
17641764
"Warning: Received unsolicited message from V-App, dropping it"
17651765
);
1766-
}
1766+
}}
17671767
}
17681768
Ok(Some(VAppResponse::Panic(msg))) => {
17691769
// V-App panicked - clear engine and notify pending request

common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "common"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55

66
[dependencies]
77
serde = { version = "1.0.204", default-features = false, features = [

ecalls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "vanadium-ecalls"
33
version = "0.1.0"
4-
edition = "2024"
4+
edition.workspace = true
55

66
[features]
77
default = ["target_native"]

macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "vanadium_macros"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55

66
[lib]
77
proc-macro = true

riscv-arch-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "vanadium-riscv-arch-tests"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition.workspace = true
55
description = "Official RISC-V architectural tests for the Vanadium CPU emulator"
66

77
[dependencies]

0 commit comments

Comments
 (0)