Merge pull request #654 from hermit-os/nightly-2024-12-15

chore: upgrade toolchain channel to `nightly-2024-12-15`
hermit-os · Dec 18, 2024 · 8d1a1ba · 8d1a1ba
2 parents 94515b2 + 8d44627
commit 8d1a1ba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/examples/tls/Cargo.toml b/examples/tls/Cargo.toml
@@ -25,5 +25,8 @@ env_logger = { version = "0.11" }
 hermit = { path = "../../hermit", default-features = false }
 
 [features]
-default = ["hermit/acpi", "hermit/dhcpv4", "hermit/fsgsbase", "hermit/pci", "hermit/pci-ids", "hermit/shell", "hermit/tcp"]
-ci = []
+default = ["hermit/acpi", "hermit/dhcpv4", "hermit/fsgsbase", "hermit/pci", "hermit/pci-ids", "hermit/tcp"]
+ci = []
+
+[target.'cfg(all(target_os = "hermit", target_arch = "x86_64"))'.dependencies]
+hermit = { path = "../../hermit", default-features = false, features = ["shell"] }
diff --git a/examples/wasmtime/src/preview1.rs b/examples/wasmtime/src/preview1.rs
@@ -6,6 +6,7 @@
 // working directory of the WASI application.
 
 use std::cmp::Ordering;
+use std::ffi::c_char;
 use std::mem::MaybeUninit;
 use std::sync::{Mutex, OnceLock};
 use std::time::{Instant, SystemTime, UNIX_EPOCH};
@@ -208,7 +209,7 @@ pub(crate) fn init<T>(linker: &mut wasmtime::Linker<T>) -> Result<()> {
 					c_path[..path.len()].copy_from_slice(path.as_bytes());
 					{
 						let raw_fd =
-							unsafe { hermit_abi::open(c_path.as_ptr() as *const i8, flags, 0) };
+							unsafe { hermit_abi::open(c_path.as_ptr() as *const c_char, flags, 0) };
 						let mut guard = FD.lock().unwrap();
 						for (i, entry) in guard.iter_mut().enumerate() {
 							if entry.is_none() {

diff --git a/kernel b/kernel
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-09-01"
+channel = "nightly-2024-12-15"
 components = [ "rust-src" ]
+4 −37		.github/workflows/ci.yml
+2 −2		.vscode/settings.json
+69 −69		Cargo.lock
+28 −1		Cargo.toml
+1 −1		rust-toolchain.toml
+1 −0		rustfmt.toml
+2 −2		src/arch/aarch64/kernel/interrupts.rs
+36 −33		src/arch/aarch64/kernel/mod.rs
+15 −13		src/arch/aarch64/kernel/pci.rs
+12 −7		src/arch/aarch64/kernel/processor.rs
+3 −3		src/arch/aarch64/kernel/scheduler.rs
+0 −5		src/arch/aarch64/kernel/serial.rs
+1 −1		src/arch/aarch64/kernel/start.rs
+2 −2		src/arch/aarch64/kernel/switch.rs
+1 −1		src/arch/aarch64/kernel/systemtime.rs
+5 −5		src/arch/aarch64/mm/paging.rs
+0 −6		src/arch/mod.rs
+32 −30		src/arch/riscv64/kernel/devicetree.rs
+3 −3		src/arch/riscv64/kernel/interrupts.rs
+22 −11		src/arch/riscv64/kernel/mod.rs
+3 −3		src/arch/riscv64/kernel/processor.rs
+1 −1		src/arch/riscv64/kernel/scheduler.rs
+5 −5		src/arch/riscv64/mm/paging.rs
+1 −1		src/arch/riscv64/mm/virtualmem.rs
+1 −1		src/arch/riscv64/mod.rs
+6 −8		src/arch/x86_64/kernel/acpi.rs
+16 −16		src/arch/x86_64/kernel/apic.rs
+5 −4		src/arch/x86_64/kernel/interrupts.rs
+7 −7		src/arch/x86_64/kernel/mmio.rs
+43 −30		src/arch/x86_64/kernel/mod.rs
+2 −2		src/arch/x86_64/kernel/pci.rs
+4 −4		src/arch/x86_64/kernel/pic.rs
+15 −13		src/arch/x86_64/kernel/processor.rs
+1 −1		src/arch/x86_64/kernel/scheduler.rs
+2 −9		src/arch/x86_64/kernel/serial.rs
+2 −2		src/arch/x86_64/kernel/switch.rs
+4 −4		src/arch/x86_64/kernel/systemtime.rs
+4 −4		src/arch/x86_64/kernel/vga.rs
+7 −4		src/arch/x86_64/mm/paging.rs
+2 −2		src/arch/x86_64/mm/virtualmem.rs
+3 −3		src/config.rs
+31 −8		src/console.rs
+3 −1		src/drivers/fs/virtio_fs.rs
+3 −8		src/drivers/fs/virtio_pci.rs
+30 −31		src/drivers/net/gem.rs
+6 −6		src/drivers/net/rtl8139.rs
+39 −32		src/drivers/net/virtio/mod.rs
+5 −12		src/drivers/net/virtio/pci.rs
+5 −5		src/drivers/pci.rs
+1 −1		src/drivers/virtio/transport/mmio.rs
+5 −5		src/drivers/virtio/virtqueue/mod.rs
+11 −12		src/drivers/virtio/virtqueue/packed.rs
+2 −3		src/drivers/virtio/virtqueue/split.rs
+4 −7		src/drivers/vsock/mod.rs
+6 −12		src/drivers/vsock/pci.rs
+1 −1		src/entropy.rs
+1 −1		src/env.rs
+18 −18		src/executor/device.rs
+2 −2		src/executor/mod.rs
+15 −16		src/executor/network.rs
+3 −3		src/executor/vsock.rs
+9 −9		src/fd/mod.rs
+14 −23		src/fd/socket/tcp.rs
+7 −10		src/fd/socket/vsock.rs
+4 −10		src/fd/stdio.rs
+72 −58		src/fs/fuse.rs
+1 −4		src/fs/mem.rs
+1 −1		src/init_cell.rs
+5 −10		src/lib.rs
+21 −9		src/logging.rs
+20 −0		src/macros.rs
+12 −12		src/scheduler/mod.rs
+1 −3		src/scheduler/task.rs
+1 −2		src/shell.rs
+2 −2		src/syscalls/entropy.rs
+2 −3		src/syscalls/futex.rs
+1 −1		src/syscalls/interfaces/mod.rs
+25 −29		src/syscalls/mod.rs
+3 −3		src/syscalls/semaphore.rs
+58 −56		src/syscalls/socket.rs
+5 −5		src/syscalls/tasks.rs
+1 −1		tests/basic_mem.rs
+4 −4		tests/thread.rs
+1 −1		xtask/Cargo.toml
+1 −1		xtask/src/ci/qemu.rs
+18 −7		xtask/src/clippy.rs