diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3ec268466d..543504edac 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2023-10-15" +channel = "nightly-2023-11-01" components = [ "llvm-tools", "rust-src", diff --git a/src/arch/aarch64/kernel/mod.rs b/src/arch/aarch64/kernel/mod.rs index 4399c3fd78..3b48821c3a 100644 --- a/src/arch/aarch64/kernel/mod.rs +++ b/src/arch/aarch64/kernel/mod.rs @@ -20,7 +20,6 @@ use hermit_entry::boot_info::{BootInfo, RawBootInfo}; use crate::arch::aarch64::kernel::core_local::*; use crate::arch::aarch64::kernel::serial::SerialPort; -pub use crate::arch::aarch64::kernel::systemtime::get_boot_time; use crate::arch::aarch64::mm::{PhysAddr, VirtAddr}; use crate::env; diff --git a/src/arch/mod.rs b/src/arch/mod.rs index 8d81850e91..369bcf2931 100644 --- a/src/arch/mod.rs +++ b/src/arch/mod.rs @@ -17,8 +17,9 @@ cfg_if::cfg_if! { pub use self::aarch64::kernel::scheduler; pub use self::aarch64::kernel::switch; pub use self::aarch64::kernel::systemtime::get_boot_time; + #[cfg(feature = "smp")] + pub use self::aarch64::kernel::application_processor_init; pub use self::aarch64::kernel::{ - application_processor_init, boot_application_processors, get_processor_count, message_output_init, diff --git a/src/drivers/net/virtio_net.rs b/src/drivers/net/virtio_net.rs index 2e2115c10f..864206536e 100644 --- a/src/drivers/net/virtio_net.rs +++ b/src/drivers/net/virtio_net.rs @@ -336,7 +336,7 @@ impl TxQueues { self.vqs.push(Rc::new(vq)); if self.vqs.len() == 1 { // Unwrapping is safe, as one virtq will be definitely in the vector. - let vq = self.vqs.get(0).unwrap(); + let vq = self.vqs.first().unwrap(); if dev_cfg .features diff --git a/src/lib.rs b/src/lib.rs index e8c00d5fec..e3ef209452 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,7 +16,6 @@ #![feature(maybe_uninit_slice)] #![feature(naked_functions)] #![feature(noop_waker)] -#![feature(pointer_byte_offsets)] #![feature(pointer_is_aligned)] #![feature(ptr_from_ref)] #![feature(slice_from_ptr_range)]