fix: cargo clippy errors

arceos-org · Nov 26, 2023 · 7a90e59 · 7a90e59
1 parent 07b6d52
commit 7a90e59
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 8 deletions.
diff --git a/api/arceos_posix_api/src/lib.rs b/api/arceos_posix_api/src/lib.rs
@@ -4,7 +4,6 @@
 
 #![cfg_attr(all(not(test), not(doc)), no_std)]
 #![feature(ip_in_core)]
-#![feature(result_option_inspect)]
 #![feature(doc_cfg)]
 #![feature(doc_auto_cfg)]
 #![allow(clippy::missing_safety_doc)]

diff --git a/crates/allocator/src/lib.rs b/crates/allocator/src/lib.rs
@@ -9,7 +9,6 @@
 //! - [`IdAllocator`]: Used to allocate unique IDs.
 
 #![no_std]
-#![feature(result_option_inspect)]
 #![cfg_attr(feature = "allocator_api", feature(allocator_api))]
 
 #[cfg(feature = "bitmap")]

diff --git a/crates/driver_virtio/src/blk.rs b/crates/driver_virtio/src/blk.rs
@@ -44,13 +44,13 @@ impl<H: Hal, T: Transport> BlockDriverOps for VirtIoBlkDev<H, T> {
 
     fn read_block(&mut self, block_id: u64, buf: &mut [u8]) -> DevResult {
         self.inner
-            .read_block(block_id as _, buf)
+            .read_blocks(block_id as _, buf)
             .map_err(as_dev_err)
     }
 
     fn write_block(&mut self, block_id: u64, buf: &[u8]) -> DevResult {
         self.inner
-            .write_block(block_id as _, buf)
+            .write_blocks(block_id as _, buf)
             .map_err(as_dev_err)
     }
 

diff --git a/crates/driver_virtio/src/gpu.rs b/crates/driver_virtio/src/gpu.rs
@@ -7,7 +7,7 @@ use virtio_drivers::{device::gpu::VirtIOGpu as InnerDev, transport::Transport, H
 
 /// The VirtIO GPU device driver.
 pub struct VirtIoGpuDev<H: Hal, T: Transport> {
-    inner: InnerDev<'static, H, T>,
+    inner: InnerDev<H, T>,
     info: DisplayInfo,
 }
 

diff --git a/crates/flatten_objects/src/lib.rs b/crates/flatten_objects/src/lib.rs
@@ -30,7 +30,6 @@
 //! ```
 
 #![no_std]
-#![feature(const_maybe_uninit_zeroed)]
 #![feature(maybe_uninit_uninit_array)]
 #![feature(const_maybe_uninit_uninit_array)]
 

diff --git a/crates/page_table/src/lib.rs b/crates/page_table/src/lib.rs
@@ -19,7 +19,6 @@
 
 #![no_std]
 #![feature(const_trait_impl)]
-#![feature(result_option_inspect)]
 #![feature(doc_auto_cfg)]
 
 #[macro_use]

diff --git a/modules/axhal/src/lib.rs b/modules/axhal/src/lib.rs
@@ -27,7 +27,6 @@
 #![no_std]
 #![feature(asm_const)]
 #![feature(naked_functions)]
-#![feature(const_maybe_uninit_zeroed)]
 #![feature(const_option)]
 #![feature(doc_auto_cfg)]