Upgrades all crates to 2024 edition

Author: ultimaweapon

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "okf"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lints.rust]
 unexpected_cfgs = { level = "deny", check-cfg = ['cfg(fw, values("1100"))'] }

macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "okf-macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 proc-macro = true

ps4-1100/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
-name = "okf-1100"
+name = "ps4-1100"
 version = "0.1.0"
-edition = "2021"
-links = "orbiskernel"
+edition = "2024"
 
 [dependencies]
 okf = { version = "0.1.0", path = "../" }

ps4-1100/src/lib.rs

@@ -18,7 +18,7 @@ use okf::malloc::MallocFlags;
 use okf::queue::TailQueue;
 use okf::socket::SockAddr;
 use okf::uio::UioSeg;
-use okf::{offset, panic_handler, MappedKernel, StaticMut};
+use okf::{MappedKernel, StaticMut, offset, panic_handler};
 
 mod file;
 mod lock;
@@ -190,7 +190,7 @@ impl okf::Kernel for Kernel {
 
     #[offset(0x264620)]
     unsafe fn solisten(self, so: *mut Self::Socket, backlog: c_int, td: *mut Self::Thread)
-        -> c_int;
+    -> c_int;
 
     #[offset(0x21DC40)]
     unsafe fn strlen(self, s: *const c_char) -> usize;

ps4-1100/src/mount.rs

@@ -1,6 +1,6 @@
+use crate::Kernel;
 use crate::lock::Mtx;
 use crate::vnode::Vnode;
-use crate::Kernel;
 use core::ffi::{c_char, c_int};
 use core::mem::MaybeUninit;
 use core::num::NonZero;
@@ -73,11 +73,11 @@ pub struct FsOps {
 impl okf::mount::FsOps<Kernel> for FsOps {
     unsafe fn root(&self, mp: *mut Mount, flags: c_int) -> Result<*mut Vnode, NonZero<c_int>> {
         let mut vp = MaybeUninit::uninit();
-        let errno = (self.root)(mp, flags, vp.as_mut_ptr());
+        let errno = unsafe { (self.root)(mp, flags, vp.as_mut_ptr()) };
 
         match NonZero::new(errno) {
             Some(v) => Err(v),
-            None => Ok(vp.assume_init()),
+            None => Ok(unsafe { vp.assume_init() }),
         }
     }
 }

ps4-1100/src/namei.rs

@@ -25,11 +25,11 @@ impl okf::namei::ComponentName<crate::Kernel> for ComponentName {
             op,
             flags: 0,
             td,
-            cred: (*td).cred(),
+            cred: unsafe { (*td).cred() },
             lk,
             buf,
             name: buf,
-            len: k.strlen(buf) as _,
+            len: unsafe { k.strlen(buf) as _ },
             consume: 0,
         }
     }

ps4-1100/src/thread.rs

@@ -1,5 +1,5 @@
-use crate::ucred::Ucred;
 use crate::Kernel;
+use crate::ucred::Ucred;
 
 /// Implementation of [`okf::thread::Thread`] for 11.00.
 #[repr(C)]

ps4-1100/src/uio.rs

@@ -1,5 +1,5 @@
-use crate::thread::Thread;
 use crate::Kernel;
+use crate::thread::Thread;
 use core::ffi::c_int;
 use okf::uio::{IoVec, UioRw, UioSeg};
 
@@ -17,7 +17,7 @@ pub struct Uio {
 
 impl okf::uio::Uio<Kernel> for Uio {
     unsafe fn write(iov: *mut IoVec, td: *mut Thread) -> Option<Self> {
-        let res = (*iov).len;
+        let res = unsafe { (*iov).len };
 
         if res > Self::io_max() {
             return None;
@@ -35,7 +35,7 @@ impl okf::uio::Uio<Kernel> for Uio {
     }
 
     unsafe fn read(iov: *mut IoVec, off: usize, td: *mut Thread) -> Option<Self> {
-        let res = (*iov).len;
+        let res = unsafe { (*iov).len };
 
         if res > Self::io_max() {
             return None;

src/fd/mod.rs

@@ -1,7 +1,7 @@
+use crate::Kernel;
 use crate::pcpu::Pcpu;
 use crate::thread::Thread;
 use crate::uio::{IoVec, Uio, UioSeg};
-use crate::Kernel;
 use bitflags::bitflags;
 use core::ffi::{c_char, c_int};
 use core::marker::PhantomData;
@@ -21,13 +21,13 @@ pub unsafe fn openat<K: Kernel>(
     mode: c_int,
 ) -> Result<OwnedFd<K>, NonZero<c_int>> {
     let td = K::Pcpu::curthread();
-    let errno = kern.kern_openat(td, fd, path, seg, flags, mode);
+    let errno = unsafe { kern.kern_openat(td, fd, path, seg, flags, mode) };
 
     match NonZero::new(errno) {
         Some(v) => Err(v),
         None => Ok(OwnedFd {
             kern,
-            fd: (*td).ret(0).try_into().unwrap(),
+            fd: unsafe { (*td).ret(0).try_into().unwrap() },
             phantom: PhantomData,
         }),
     }
@@ -43,7 +43,7 @@ pub unsafe fn write_all<K: Kernel>(
     td: *mut K::Thread,
 ) -> Result<(), NonZero<c_int>> {
     while !data.is_empty() {
-        let written = match write(kern, fd, data, td) {
+        let written = match unsafe { write(kern, fd, data, td) } {
             Ok(v) => v,
             Err(e) if e == K::EINTR => continue,
             Err(e) => return Err(e),
@@ -75,12 +75,12 @@ pub unsafe fn write<K: Kernel>(
     };
 
     // Write.
-    let mut uio = K::Uio::write(&mut vec, td).unwrap();
-    let errno = kern.kern_writev(td, fd, &mut uio);
+    let mut uio = unsafe { K::Uio::write(&mut vec, td).unwrap() };
+    let errno = unsafe { kern.kern_writev(td, fd, &mut uio) };
 
     match NonZero::new(errno) {
         Some(v) => Err(v),
-        None => Ok((*td).ret(0)),
+        None => Ok(unsafe { (*td).ret(0) }),
     }
 }
 

src/file/mod.rs

@@ -1,9 +1,9 @@
-use crate::pcpu::Pcpu;
 use crate::Kernel;
+use crate::pcpu::Pcpu;
 use core::ffi::c_int;
 use core::num::NonZero;
 use core::ptr::null_mut;
-use core::sync::atomic::{fence, AtomicU32, Ordering};
+use core::sync::atomic::{AtomicU32, Ordering, fence};
 
 /// Represents `file` structure.
 pub trait File: Sized {