diff --git a/kernel/arch/hosted/src/lib.rs b/kernel/arch/hosted/src/lib.rs index a9a40551..a9a68b20 100644 --- a/kernel/arch/hosted/src/lib.rs +++ b/kernel/arch/hosted/src/lib.rs @@ -9,7 +9,7 @@ use kernel_arch_interface::{ mem::{ DeviceMemoryAttributes, KernelTableManager, PhysicalMemoryAllocator, RawDeviceMemoryMapping, }, - task::{Scheduler, TaskContext}, + task::{Scheduler, TaskContext, UserContextInfo}, Architecture, }; use libk_mm_interface::{ @@ -154,13 +154,7 @@ impl TaskContext unimplemented!() } - fn user( - _entry: usize, - _arg: usize, - _cr3: u64, - _user_stack_sp: usize, - _tls_address: usize, - ) -> Result { + fn user(_info: UserContextInfo) -> Result { unimplemented!() } diff --git a/kernel/libk/libk-mm/Cargo.toml b/kernel/libk/libk-mm/Cargo.toml index 0fe12ae9..447cc8c8 100644 --- a/kernel/libk/libk-mm/Cargo.toml +++ b/kernel/libk/libk-mm/Cargo.toml @@ -15,3 +15,6 @@ vmalloc = { path = "../../lib/vmalloc" } libyalloc = { path = "../../../lib/libyalloc", default-features = false, features = ["dep-of-kernel"] } log = "0.4.22" + +[lints.rust] +unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] } diff --git a/kernel/libk/libk-mm/src/lib.rs b/kernel/libk/libk-mm/src/lib.rs index e17820b1..4668fcf6 100644 --- a/kernel/libk/libk-mm/src/lib.rs +++ b/kernel/libk/libk-mm/src/lib.rs @@ -26,11 +26,13 @@ use yggdrasil_abi::error::Error; pub mod address; pub mod device; -pub mod heap; pub mod phys; pub mod pointer; pub mod process; +#[cfg(any(target_os = "none", rust_analyzer))] +pub mod heap; + pub use libk_mm_interface::table; pub struct TableAllocatorImpl; diff --git a/kernel/libk/src/lib.rs b/kernel/libk/src/lib.rs index 230dea3a..bb480987 100644 --- a/kernel/libk/src/lib.rs +++ b/kernel/libk/src/lib.rs @@ -33,10 +33,12 @@ pub mod task; pub mod arch; pub mod module; -pub mod panic; pub mod random; pub mod vfs; +#[cfg(any(target_os = "none", rust_analyzer))] +pub mod panic; + pub mod device { pub use libk_device::*; } diff --git a/kernel/libk/src/vfs/file/mod.rs b/kernel/libk/src/vfs/file/mod.rs index 4cf728a3..ecffb28e 100644 --- a/kernel/libk/src/vfs/file/mod.rs +++ b/kernel/libk/src/vfs/file/mod.rs @@ -792,7 +792,7 @@ mod tests { .unwrap(); let mut buf = [0; 512]; - assert_eq!(&*data.lock().unwrap(), &[]); + assert_eq!(&*data.lock().unwrap(), b""); assert_eq!(file.tell().unwrap(), 0); assert_eq!(file.write(b"Hello").unwrap(), 5);