Run clippy (#438)

src/api/syscall.rs

@@ -13,7 +13,7 @@ pub fn sleep(seconds: f64) {
 
 pub fn delete(path: &str) -> Result<(), ()> {
     let path_ptr = path.as_ptr() as usize;
-    let path_len = path.len() as usize;
+    let path_len = path.len();
     let res = unsafe { syscall!(DELETE, path_ptr, path_len) } as isize;
     if res >= 0 {
         Ok(())
@@ -24,7 +24,7 @@ pub fn delete(path: &str) -> Result<(), ()> {
 
 pub fn info(path: &str) -> Option<FileInfo> {
     let path_ptr = path.as_ptr() as usize;
-    let path_len = path.len() as usize;
+    let path_len = path.len();
     let mut info = FileInfo::new();
     let stat_ptr = &mut info as *mut FileInfo as usize;
     let res = unsafe { syscall!(INFO, path_ptr, path_len, stat_ptr) } as isize;
@@ -37,7 +37,7 @@ pub fn info(path: &str) -> Option<FileInfo> {
 
 pub fn open(path: &str, flags: usize) -> Option<usize> {
     let ptr = path.as_ptr() as usize;
-    let len = path.len() as usize;
+    let len = path.len();
     let res = unsafe { syscall!(OPEN, ptr, len, flags) } as isize;
     if res >= 0 {
         Some(res as usize)
@@ -57,7 +57,7 @@ pub fn dup(old_handle: usize, new_handle: usize) -> Option<usize> {
 
 pub fn read(handle: usize, buf: &mut [u8]) -> Option<usize> {
     let ptr = buf.as_ptr() as usize;
-    let len = buf.len() as usize;
+    let len = buf.len();
     let res = unsafe { syscall!(READ, handle, ptr, len) } as isize;
     if res >= 0 {
         Some(res as usize)
@@ -68,7 +68,7 @@ pub fn read(handle: usize, buf: &mut [u8]) -> Option<usize> {
 
 pub fn write(handle: usize, buf: &[u8]) -> Option<usize> {
     let ptr = buf.as_ptr() as usize;
-    let len = buf.len() as usize;
+    let len = buf.len();
     let res = unsafe { syscall!(WRITE, handle, ptr, len) } as isize;
     if res >= 0 {
         Some(res as usize)
@@ -78,14 +78,14 @@ pub fn write(handle: usize, buf: &[u8]) -> Option<usize> {
 }
 
 pub fn close(handle: usize) {
-    unsafe { syscall!(CLOSE, handle as usize) };
+    unsafe { syscall!(CLOSE, handle) };
 }
 
 pub fn spawn(path: &str, args: &[&str]) -> Result<(), ExitCode> {
     let path_ptr = path.as_ptr() as usize;
-    let path_len = path.len() as usize;
     let args_ptr = args.as_ptr() as usize;
-    let args_len = args.len() as usize;
+    let path_len = path.len();
+    let args_len = args.len();
     let res = unsafe { syscall!(SPAWN, path_ptr, path_len, args_ptr, args_len) };
     if res == 0 {
         Ok(())

src/bin/sleep.rs

@@ -11,7 +11,6 @@ fn main(args: &[&str]) {
     if args.len() == 2 {
         if let Ok(duration) = args[1].parse::<f64>() {
             syscall::sleep(duration);
-            return;
         } else {
             syscall::exit(ExitCode::DataError);
         }

src/sys/clock.rs

@@ -95,7 +95,7 @@ fn days_before_year(year: u64) -> u64 {
 
 fn days_before_month(year: u64, month: u64) -> u64 {
     let leap_day = is_leap_year(year) && month > 2;
-    DAYS_BEFORE_MONTH[(month as usize) - 1] + if leap_day { 1 } else { 0 }
+    DAYS_BEFORE_MONTH[(month as usize) - 1] + (leap_day as u64)
 }
 
 fn is_leap_year(year: u64) -> bool {

src/sys/fs/block_device.rs

@@ -39,15 +39,15 @@ impl BlockDeviceIO for BlockDevice {
 
     fn block_size(&self) -> usize {
         match self {
-            BlockDevice::Mem(dev) => dev.block_size() as usize,
-            BlockDevice::Ata(dev) => dev.block_size() as usize,
+            BlockDevice::Mem(dev) => dev.block_size(),
+            BlockDevice::Ata(dev) => dev.block_size(),
         }
     }
 
     fn block_count(&self) -> usize {
         match self {
-            BlockDevice::Mem(dev) => dev.block_count() as usize,
-            BlockDevice::Ata(dev) => dev.block_count() as usize,
+            BlockDevice::Mem(dev) => dev.block_count(),
+            BlockDevice::Ata(dev) => dev.block_count(),
         }
     }
 }

src/sys/fs/dir.rs

@@ -85,12 +85,7 @@ impl Dir {
     }
 
     pub fn find(&self, name: &str) -> Option<DirEntry> {
-        for entry in self.entries() {
-            if entry.name() == name {
-                return Some(entry);
-            }
-        }
-        None
+        self.entries().find(|entry| entry.name() == name)
     }
 
     // TODO: return a Result

src/sys/vga.rs

@@ -258,7 +258,7 @@ impl Writer {
         let mut data: Port<u8> = Port::new(DAC_DATA_REG);
         for (i, (r, g, b)) in palette.colors.iter().enumerate() {
             if i < 16 {
-                let reg = color::from_index(i as usize).to_vga_reg();
+                let reg = color::from_index(i).to_vga_reg();
                 unsafe {
                     addr.write(reg);
                     data.write(vga_color(*r));

src/usr/httpd.rs

@@ -146,7 +146,7 @@ impl Response {
                 return false;
             }
         }
-        return true;
+        true
     }
 }
 
@@ -301,7 +301,7 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                                         let real_path = real_path.trim_end_matches('/');
                                         if fs::exists(real_path) {
                                             res.code = 403;
-                                        } else if let Some(handle) = fs::create_dir(&real_path) {
+                                        } else if let Some(handle) = fs::create_dir(real_path) {
                                             syscall::close(handle);
                                             res.code = 200;
                                         } else {

src/usr/lisp/env.rs

@@ -297,7 +297,7 @@ pub fn default_env() -> Rc<RefCell<Env>> {
         let mut res = vec![];
         for arg in args {
             if let Exp::List(list) = arg {
-                res.extend_from_slice(&list);
+                res.extend_from_slice(list);
             } else {
                 return Err(Err::Reason("Expected arg to be a list".to_string()))
             }