lint

Author: veeso

src/ssh/commons.rs

@@ -105,8 +105,7 @@ pub fn connect(opts: &SshOpts) -> RemoteResult<Session> {
     match opts
         .key_storage
         .as_ref()
-        .map(|x| x.resolve(ssh_config.host.as_str(), ssh_config.username.as_str()))
-        .flatten()
+        .and_then(|x| x.resolve(ssh_config.host.as_str(), ssh_config.username.as_str()))
     {
         Some(rsa_key) => {
             session_auth_with_rsakey(

src/ssh/config.rs

@@ -66,15 +66,15 @@ impl Config {
         let mut reader = BufReader::new(File::open(p).map_err(|e| {
             RemoteError::new_ex(
                 RemoteErrorType::IoError,
-                format!("Could not open configuration file: {}", e.to_string()),
+                format!("Could not open configuration file: {}", e),
             )
         })?);
         SshConfig::default()
             .parse(&mut reader)
             .map_err(|e| {
                 RemoteError::new_ex(
                     RemoteErrorType::IoError,
-                    format!("Could not parse configuration file: {}", e.to_string()),
+                    format!("Could not parse configuration file: {}", e),
                 )
             })
             .map(|x| x.query(host))

src/ssh/scp.rs

@@ -215,7 +215,7 @@ impl ScpFs {
     /// Returns from a `ls -l` command output file name token, the name of the file and the symbolic link (if there is any)
     fn get_name_and_link(&self, token: &str) -> (String, Option<PathBuf>) {
         let tokens: Vec<&str> = token.split(" -> ").collect();
-        let filename: String = String::from(*tokens.get(0).unwrap());
+        let filename: String = String::from(*tokens.first().unwrap());
         let symlink: Option<PathBuf> = tokens.get(1).map(PathBuf::from);
         (filename, symlink)
     }

src/ssh/sftp.rs

@@ -145,13 +145,11 @@ impl SftpFs {
     fn metadata_to_filestat(metadata: Metadata) -> FileStat {
         let atime = metadata
             .accessed
-            .map(|x| x.duration_since(SystemTime::UNIX_EPOCH).ok())
-            .flatten()
+            .and_then(|x| x.duration_since(SystemTime::UNIX_EPOCH).ok())
             .map(|x| x.as_secs());
         let mtime = metadata
             .modified
-            .map(|x| x.duration_since(SystemTime::UNIX_EPOCH).ok())
-            .flatten()
+            .and_then(|x| x.duration_since(SystemTime::UNIX_EPOCH).ok())
             .map(|x| x.as_secs());
         FileStat {
             size: Some(metadata.size),

src/utils/fmt.rs

@@ -43,7 +43,7 @@ mod test {
 
     #[test]
     fn should_fmt_time() {
-        let system_time: SystemTime = SystemTime::from(SystemTime::UNIX_EPOCH);
+        let system_time: SystemTime = SystemTime::UNIX_EPOCH;
         assert_eq!(
             fmt_time_utc(system_time, "%Y-%m-%d %H:%M"),
             String::from("1970-01-01 00:00")

src/utils/path.rs

@@ -47,11 +47,11 @@ mod test {
     #[test]
     fn absolutize_path() {
         assert_eq!(
-            absolutize(&Path::new("/home/omar"), &Path::new("readme.txt")).as_path(),
+            absolutize(Path::new("/home/omar"), Path::new("readme.txt")).as_path(),
             Path::new("/home/omar/readme.txt")
         );
         assert_eq!(
-            absolutize(&Path::new("/home/omar"), &Path::new("/tmp/readme.txt")).as_path(),
+            absolutize(Path::new("/home/omar"), Path::new("/tmp/readme.txt")).as_path(),
             Path::new("/tmp/readme.txt")
         );
     }