clippy

src/sys/select.rs

@@ -3,7 +3,6 @@ use crate::errno::Errno;
 use crate::sys::time::{TimeSpec, TimeVal};
 use crate::Result;
 use libc::{self, c_int};
-use std::convert::TryFrom;
 use std::iter::FusedIterator;
 use std::mem;
 use std::ops::Range;
@@ -21,10 +20,7 @@ pub struct FdSet<'fd> {
 }
 
 fn assert_fd_valid(fd: RawFd) {
-    assert!(
-        usize::try_from(fd).map_or(false, |fd| fd < FD_SETSIZE),
-        "fd must be in the range 0..FD_SETSIZE",
-    );
+    assert!(fd < FD_SETSIZE, "fd must be in the range 0..FD_SETSIZE",);
 }
 
 impl<'fd> FdSet<'fd> {
@@ -110,7 +106,7 @@ impl<'fd> FdSet<'fd> {
     pub fn fds(&self, highest: Option<RawFd>) -> Fds {
         Fds {
             set: self,
-            range: 0..highest.map(|h| h as usize + 1).unwrap_or(FD_SETSIZE),
+            range: 0..highest.map(|h| h + 1).unwrap_or(FD_SETSIZE) as usize,
         }
     }
 }

test/sys/test_select.rs

@@ -68,13 +68,7 @@ macro_rules! generate_fdset_bad_fd_tests {
 
 mod test_fdset_too_large_fd {
     use super::*;
-    use std::convert::TryInto;
-    generate_fdset_bad_fd_tests!(
-        FD_SETSIZE.try_into().unwrap(),
-        insert,
-        remove,
-        contains,
-    );
+    generate_fdset_bad_fd_tests!(FD_SETSIZE, insert, remove, contains,);
 }
 
 #[test]

test/test_sendfile.rs

@@ -157,10 +157,10 @@ fn test_sendfile_dragonfly() {
 fn test_sendfile_darwin() {
     // Declare the content
     let header_strings =
-        vec!["HTTP/1.1 200 OK\n", "Content-Type: text/plain\n", "\n"];
+        ["HTTP/1.1 200 OK\n", "Content-Type: text/plain\n", "\n"];
     let body = "Xabcdef123456";
     let body_offset = 1;
-    let trailer_strings = vec!["\n", "Served by Make Believe\n"];
+    let trailer_strings = ["\n", "Served by Make Believe\n"];
 
     // Write the body to a file
     let mut tmp = tempfile().unwrap();