Use edition 2024 for all crates

google · Dec 9, 2024 · efdae3e · efdae3e
1 parent 9737b83
commit efdae3e
Show file tree

Hide file tree

Showing 126 changed files with 207 additions and 139 deletions.
diff --git a/crates/api-desc/CHANGELOG.md b/crates/api-desc/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Minor
 
+- Use Rust edition 2024
 - Use C-string literals to implement dispatch for native applets
 - Implement `bytemuck::Pod` for generated `Params`
 

diff --git a/crates/api-desc/Cargo.toml b/crates/api-desc/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.2-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Description of the Wasefire applet API"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/api-desc/crates/update/Cargo.toml b/crates/api-desc/crates/update/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = { version = "1.0.86", default-features = false, features = ["std"] }

diff --git a/crates/api-desc/src/lib.rs b/crates/api-desc/src/lib.rs
@@ -370,13 +370,13 @@ impl Fn {
                 pub struct Params { #(#params,)* }
             }
             #[cfg(not(feature = "native"))]
-            extern "C" {
+            unsafe extern "C" {
                 #(#[doc = #docs])*
                 #[link_name = #link]
-                pub fn #name(#fn_params) -> isize;
+                pub unsafe fn #name(#fn_params) -> isize;
             }
             #[cfg(feature = "native")]
-            #[export_name = #env_link]
+            #[unsafe(export_name = #env_link)]
             #[linkage = "weak"]
             pub unsafe extern "C" fn #name(#fn_params) -> isize {
                 #let_params

diff --git a/crates/api-macro/CHANGELOG.md b/crates/api-macro/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Update `wasefire-applet-api-desc` version
 
+### Minor
+
+- Use Rust edition 2024
+
 ## 0.7.0
 
 ### Major

diff --git a/crates/api-macro/Cargo.toml b/crates/api-macro/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.8.0-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Proc-macro to generate the Wasefire applet API"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/api/CHANGELOG.md b/crates/api/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Minor
 
+- Use Rust edition 2024
 - Provide `bytemuck::Pod` for `ArrayU32`
 - Implement `bytemuck::Pod` for `U32<T>`
 

diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.7.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Low-level Wasefire applet API"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/api/src/wasm/native.rs b/crates/api/src/wasm/native.rs
@@ -16,7 +16,7 @@ use core::ffi::{c_char, CStr};
 
 use wasefire_logger as log;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 #[linkage = "weak"]
 pub(crate) unsafe extern "C" fn env_dispatch(link: *const c_char, _params: *const u32) -> isize {
     log::panic!("{:?} is not defined", unsafe { CStr::from_ptr(link) });

diff --git a/crates/board/CHANGELOG.md b/crates/board/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.8.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/board/Cargo.toml b/crates/board/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.8.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire board API"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/cli-tools/CHANGELOG.md b/crates/cli-tools/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Minor
 
+- Use Rust edition 2024
 - Add `fs::targz_{list,extract}()` to manipulate tarballs
 - Add `fs::download()` for download files
 

diff --git a/crates/cli-tools/Cargo.toml b/crates/cli-tools/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Command-line utilities for Wasefire"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/cli/CHANGELOG.md b/crates/cli/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Minor
 
+- Use Rust edition 2024
 - Add `self-update` to download and install the latest CLI
 
 ### Patch

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire CLI to manage applets and platforms"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/error/CHANGELOG.md b/crates/error/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.1.3-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Add clippy lint

diff --git a/crates/error/Cargo.toml b/crates/error/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.3-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire API errors"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/interpreter/CHANGELOG.md b/crates/interpreter/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.3.2-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Fix clippy lints

diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.3.2-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire WebAssembly interpreter"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/interpreter/src/module.rs b/crates/interpreter/src/module.rs
@@ -89,7 +89,7 @@ impl<'m> Module<'m> {
         &self.types
     }
 
-    pub(crate) fn imports(&self) -> impl Iterator<Item = Import<'m>> {
+    pub(crate) fn imports(&self) -> impl Iterator<Item = Import<'m>> + use<'m> {
         let (n, mut parser) = match self.section(SectionId::Import) {
             None => (0, Parser::default()),
             Some(mut parser) => (parser.parse_vec().into_ok(), parser),

diff --git a/crates/logger/CHANGELOG.md b/crates/logger/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.1.7-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Add clippy lint

diff --git a/crates/logger/Cargo.toml b/crates/logger/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.7-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire platform logging"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/one-of/CHANGELOG.md b/crates/one-of/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.1.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Add clippy lint

diff --git a/crates/one-of/Cargo.toml b/crates/one-of/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Macros for mutually exclusive features"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/prelude/CHANGELOG.md b/crates/prelude/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.7.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.7.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "High-level Wasefire applet API"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/prelude/src/allocator/native.rs b/crates/prelude/src/allocator/native.rs
@@ -14,12 +14,12 @@
 
 use core::alloc::{GlobalAlloc, Layout};
 
-extern "C" {
-    fn board_alloc(size: u32, align: u32) -> *mut u8;
-    fn board_dealloc(ptr: *mut u8, size: u32, align: u32);
+unsafe extern "C" {
+    unsafe fn board_alloc(size: u32, align: u32) -> *mut u8;
+    unsafe fn board_dealloc(ptr: *mut u8, size: u32, align: u32);
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn applet_init() {}
 
 struct Allocator;

diff --git a/crates/prelude/src/allocator/wasm.rs b/crates/prelude/src/allocator/wasm.rs
@@ -21,7 +21,7 @@ use rlsf::Tlsf;
 
 use crate::sync::Mutex;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn init() {
     assert!(!wasefire_sync::executed!());
     const SIZE: usize = 32768;
@@ -36,7 +36,7 @@ extern "C" fn init() {
     assert!(size > NonZeroUsize::new(SIZE / 2));
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn alloc(size: u32, align: u32) -> u32 {
     let layout = match Layout::from_size_align(size as usize, align as usize) {
         Ok(x) => x,

diff --git a/crates/prelude/src/callback.rs b/crates/prelude/src/callback.rs
@@ -18,7 +18,7 @@ macro_rules! define {
         define!(#[cfg(feature = "native")] $an $(, $x)*);
     };
     (#[$m:meta] $n:ident $(, $x:ident)*) => {
-        #[$m] #[no_mangle]
+        #[$m] #[unsafe(no_mangle)]
         extern "C" fn $n (
             ptr: extern "C" fn(*const u8 $(, usize ${ignore($x)})*),
             this: *const u8 $(, $x: usize)*

diff --git a/crates/prelude/src/lib.rs b/crates/prelude/src/lib.rs
@@ -113,7 +113,7 @@ macro_rules! applet {
 
         use wasefire::*;
 
-        #[export_name = "main"]
+        #[unsafe(export_name = "main")]
         #[allow(unreachable_code)]
         #[allow(clippy::diverging_sub_expression)]
         extern "C" fn _main() {
@@ -131,7 +131,7 @@ macro_rules! applet {
 
         use wasefire::*;
 
-        #[no_mangle]
+        #[unsafe(no_mangle)]
         #[allow(unreachable_code)]
         #[allow(clippy::diverging_sub_expression)]
         extern "C" fn applet_main() {

diff --git a/crates/protocol-tokio/CHANGELOG.md b/crates/protocol-tokio/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.1.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/protocol-tokio/Cargo.toml b/crates/protocol-tokio/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire protocol using std::io::Read and Write"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/protocol-usb/CHANGELOG.md b/crates/protocol-usb/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.2.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/protocol-usb/Cargo.toml b/crates/protocol-usb/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire USB protocol between platform and host"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/protocol/CHANGELOG.md b/crates/protocol/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.2.1-git
 
+### Minor
+
+- Use Rust edition 2024
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/protocol/Cargo.toml b/crates/protocol/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.1-git"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = true
-edition = "2021"
+edition = "2024"
 description = "Wasefire protocol between platform and host"
 repository = "https://github.com/google/wasefire"
 include = ["/LICENSE", "/src/"]

diff --git a/crates/protocol/crates/schema/Cargo.toml b/crates/protocol/crates/schema/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.86"

diff --git a/crates/runner-host/Cargo.toml b/crates/runner-host/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Julien Cretin <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.86"