Skip to content

Commit 5f9cbc7

Browse files
author
Jiajie Chen
committed
Eliminate stable feature and unused unsafe warnings
1 parent 96357e6 commit 5f9cbc7

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

kernel/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#![feature(lang_items)]
2-
#![feature(alloc)]
32
#![feature(naked_functions)]
43
#![feature(untagged_unions)]
54
#![feature(asm)]
65
#![feature(optin_builtin_traits)]
76
#![feature(panic_info_message)]
87
#![feature(global_asm)]
98
#![feature(fnbox)]
10-
#![feature(maybe_uninit)]
119
#![feature(alloc_prelude)]
1210
#![deny(unused_must_use)]
11+
#![deny(stable_features)]
12+
#![deny(unused_unsafe)]
1313
#![no_std]
1414

1515
// just keep it ...

kernel/src/lkm/kernelvm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ impl VirtualArea {
122122
let mut aligned_end = (page_addr + size + PAGE_SIZE - 1);
123123
aligned_end = aligned_end - aligned_end % PAGE_SIZE;
124124
let lock = parent.allocator.lock();
125-
let mut active_pt = unsafe { lock.kernel_table() };
125+
let mut active_pt = lock.kernel_table();
126126
for p in Page::range_of(aligned_start_addr, aligned_end) {
127127
parent
128128
.page_allocator
@@ -137,7 +137,7 @@ impl VirtualArea {
137137
}
138138
pub fn unmap(&mut self, allocator: &LockedVMM, parent: &mut ByFrame<GlobalFrameAlloc>) {
139139
let lock = allocator.lock();
140-
let mut active_pt = unsafe { lock.kernel_table() };
140+
let mut active_pt = lock.kernel_table();
141141
for p in Page::range_of(self.start, self.end) {
142142
parent.unmap(active_pt.deref_mut(), p.start_address());
143143
}

kernel/src/lkm/manager.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ fn neg(u: usize) -> usize {
5656
(-(u as i64)) as usize
5757
}
5858
unsafe fn write_to_addr(base: usize, offset: usize, val: usize) {
59-
unsafe {
60-
let addr = base + offset;
61-
*(addr as *mut usize) = val;
62-
}
59+
let addr = base + offset;
60+
*(addr as *mut usize) = val;
6361
}
6462
impl ModuleManager {
6563
fn create_stub_symbol(symbol_name: &str, symbol_loc: usize) -> ModuleSymbol {
@@ -108,7 +106,7 @@ impl ModuleManager {
108106
.unwrap();
109107
use core::slice;
110108
use core::str::from_utf8;
111-
self.init_kernel_symbols(unsafe { from_utf8(&real_symbols).unwrap() });
109+
self.init_kernel_symbols(from_utf8(&real_symbols).unwrap());
112110
}
113111
pub fn init_kernel_symbols(&mut self, kernel_symbols: &str) {
114112
let lines = kernel_symbols.lines();

kernel/src/syscall/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl Syscall<'_> {
274274
mode: usize,
275275
) -> SysResult {
276276
let mut proc = self.process();
277-
let path = unsafe { check_and_clone_cstr(path)? };
277+
let path = check_and_clone_cstr(path)?;
278278
let flags = OpenFlags::from_bits_truncate(flags);
279279
info!(
280280
"openat: dir_fd: {}, path: {:?}, flags: {:?}, mode: {:#o}",

0 commit comments

Comments
 (0)