From 887a207c8be2835e2afc7db71c9e4969b6cf2af0 Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Thu, 9 May 2019 10:12:19 +0800 Subject: [PATCH] Run cargo fmt Signed-off-by: Harry Chen --- kernel/src/arch/mipsel/paging.rs | 24 ++++++-------- .../src/arch/riscv32/board/rocket_chip/mod.rs | 3 +- kernel/src/arch/riscv32/mod.rs | 1 - kernel/src/drivers/bus/mod.rs | 5 ++- kernel/src/fs/ioctl.rs | 2 +- kernel/src/memory.rs | 4 +-- kernel/src/syscall/net.rs | 31 ++++++++----------- kernel/src/util/escape_parser.rs | 1 - 8 files changed, 30 insertions(+), 41 deletions(-) diff --git a/kernel/src/arch/mipsel/paging.rs b/kernel/src/arch/mipsel/paging.rs index 0542a1e..af0a782 100644 --- a/kernel/src/arch/mipsel/paging.rs +++ b/kernel/src/arch/mipsel/paging.rs @@ -75,10 +75,7 @@ static mut __page_table_with_mode: bool = false; impl ActivePageTable { pub unsafe fn new() -> Self { - ActivePageTable( - get_root_page_table_ptr(), - ::core::mem::uninitialized(), - ) + ActivePageTable(get_root_page_table_ptr(), ::core::mem::uninitialized()) } unsafe fn get_raw_table(&mut self) -> *mut MIPSPageTable { @@ -90,9 +87,7 @@ impl ActivePageTable { } fn get_table(&mut self) -> TwoLevelPageTable<'static> { - unsafe { - TwoLevelPageTable::new(&mut *self.get_raw_table()) - } + unsafe { TwoLevelPageTable::new(&mut *self.get_raw_table()) } } } @@ -208,13 +203,12 @@ impl InactivePageTable for InactivePageTable0 { clear_all_tlb(); } - debug!("edit table {:x?} -> {:x?}", Self::active_token(), self.token()); - let mut active = unsafe { - ActivePageTable( - self.token(), - ::core::mem::uninitialized(), - ) - }; + debug!( + "edit table {:x?} -> {:x?}", + Self::active_token(), + self.token() + ); + let mut active = unsafe { ActivePageTable(self.token(), ::core::mem::uninitialized()) }; let ret = f(&mut active); debug!("finish table"); @@ -230,7 +224,7 @@ impl InactivePageTable for InactivePageTable0 { let new_token = self.token(); let old_mode = unsafe { __page_table_with_mode }; - unsafe { + unsafe { __page_table_with_mode = true; } diff --git a/kernel/src/arch/riscv32/board/rocket_chip/mod.rs b/kernel/src/arch/riscv32/board/rocket_chip/mod.rs index 7e996b6..cb14a51 100644 --- a/kernel/src/arch/riscv32/board/rocket_chip/mod.rs +++ b/kernel/src/arch/riscv32/board/rocket_chip/mod.rs @@ -19,7 +19,6 @@ pub unsafe fn init_external_interrupt() { // enable all interrupts AXI_INTC_IER.write_volatile(0xffffffff); - } /// Claim and complete external interrupt by reading and writing to @@ -43,4 +42,4 @@ pub unsafe fn enable_serial_interrupt() { // Intr enable | rx reset | tx reset const UART_IE: u32 = 0x13; SERIAL_BASE.add(UART_CTRL_REG).write_volatile(UART_IE); -} \ No newline at end of file +} diff --git a/kernel/src/arch/riscv32/mod.rs b/kernel/src/arch/riscv32/mod.rs index 028d666..ff0b2c9 100644 --- a/kernel/src/arch/riscv32/mod.rs +++ b/kernel/src/arch/riscv32/mod.rs @@ -30,7 +30,6 @@ pub extern "C" fn rust_main(hartid: usize, device_tree_paddr: usize) -> ! { unsafe { cpu::set_cpu_id(hartid); - } #[cfg(feature = "board_rocket_chip")] diff --git a/kernel/src/drivers/bus/mod.rs b/kernel/src/drivers/bus/mod.rs index 56ee0cb..5a563d7 100644 --- a/kernel/src/drivers/bus/mod.rs +++ b/kernel/src/drivers/bus/mod.rs @@ -1,3 +1,6 @@ -#[cfg(any(target_arch = "x86_64", all(target_arch = "mips", feature = "board_malta")))] +#[cfg(any( + target_arch = "x86_64", + all(target_arch = "mips", feature = "board_malta") +))] pub mod pci; pub mod virtio_mmio; diff --git a/kernel/src/fs/ioctl.rs b/kernel/src/fs/ioctl.rs index 45bdebd..30652a7 100644 --- a/kernel/src/fs/ioctl.rs +++ b/kernel/src/fs/ioctl.rs @@ -37,4 +37,4 @@ pub const FIOCLEX: usize = 0x6601; // rustc using pipe and ioctl pipe file with this request id // for non-blocking/blocking IO control setting -pub const FIONBIO: usize = 0x5421; \ No newline at end of file +pub const FIONBIO: usize = 0x5421; diff --git a/kernel/src/memory.rs b/kernel/src/memory.rs index 44cdc25..d4bff95 100644 --- a/kernel/src/memory.rs +++ b/kernel/src/memory.rs @@ -13,19 +13,19 @@ //! mipssim/malta(MIPS) -- 10MB use super::HEAP_ALLOCATOR; -use core::mem; pub use crate::arch::paging::*; use crate::consts::{KERNEL_OFFSET, MEMORY_OFFSET}; +use crate::process::current_thread; use crate::sync::SpinNoIrqLock; use alloc::boxed::Box; use bitmap_allocator::BitAlloc; use buddy_system_allocator::Heap; +use core::mem; use lazy_static::*; use log::*; pub use rcore_memory::memory_set::{handler::*, MemoryArea, MemoryAttr}; use rcore_memory::paging::PageTable; use rcore_memory::*; -use crate::process::current_thread; pub type MemorySet = rcore_memory::memory_set::MemorySet; diff --git a/kernel/src/syscall/net.rs b/kernel/src/syscall/net.rs index 6a1d176..2edb9d6 100644 --- a/kernel/src/syscall/net.rs +++ b/kernel/src/syscall/net.rs @@ -185,7 +185,11 @@ impl Syscall<'_> { iovs.write_all_from_slice(&buf[..len]); let sockaddr_in = SockAddr::from(endpoint); unsafe { - sockaddr_in.write_to(&mut self.vm(), hdr.msg_name, &mut hdr.msg_namelen as *mut u32)?; + sockaddr_in.write_to( + &mut self.vm(), + hdr.msg_name, + &mut hdr.msg_namelen as *mut u32, + )?; } } result @@ -427,17 +431,13 @@ fn sockaddr_to_endpoint( Ok(Endpoint::Ip((addr, port).into())) } AddressFamily::Unix => Err(SysError::EINVAL), - AddressFamily::Packet => { - Ok(Endpoint::LinkLevel(LinkLevelEndpoint::new( - addr.addr_ll.sll_ifindex as usize, - ))) - } - AddressFamily::Netlink => { - Ok(Endpoint::Netlink(NetlinkEndpoint::new( - addr.addr_nl.nl_pid, - addr.addr_nl.nl_groups, - ))) - } + AddressFamily::Packet => Ok(Endpoint::LinkLevel(LinkLevelEndpoint::new( + addr.addr_ll.sll_ifindex as usize, + ))), + AddressFamily::Netlink => Ok(Endpoint::Netlink(NetlinkEndpoint::new( + addr.addr_nl.nl_pid, + addr.addr_nl.nl_groups, + ))), _ => Err(SysError::EINVAL), } } @@ -456,12 +456,7 @@ impl SockAddr { /// Write to user sockaddr /// Check mutability for user - unsafe fn write_to( - self, - vm: &MemorySet, - addr: *mut SockAddr, - addr_len: *mut u32, - ) -> SysResult { + unsafe fn write_to(self, vm: &MemorySet, addr: *mut SockAddr, addr_len: *mut u32) -> SysResult { // Ignore NULL if addr.is_null() { return Ok(0); diff --git a/kernel/src/util/escape_parser.rs b/kernel/src/util/escape_parser.rs index 85ba21f..0fc0442 100644 --- a/kernel/src/util/escape_parser.rs +++ b/kernel/src/util/escape_parser.rs @@ -7,7 +7,6 @@ use super::color::ConsoleColor; use heapless::consts::U8; use heapless::Vec; - #[derive(Debug, Clone, Copy, PartialEq)] #[repr(align(4))] pub struct CharacterAttribute {