diff --git a/src/edit.rs b/src/edit.rs
index a77018d50..18e412833 100644
--- a/src/edit.rs
+++ b/src/edit.rs
@@ -291,7 +291,7 @@ impl<'out, 'prompt, H: Helper> Refresher for State<'out, 'prompt, H> {
     }
 
     fn hint_text(&self) -> Option<&str> {
-        self.hint.as_ref().map(|hint| hint.completion()).flatten()
+        self.hint.as_ref().and_then(|hint| hint.completion())
     }
 
     fn line(&self) -> &str {
diff --git a/src/tty/unix.rs b/src/tty/unix.rs
index 09ec0527a..e626db7ac 100644
--- a/src/tty/unix.rs
+++ b/src/tty/unix.rs
@@ -719,7 +719,7 @@ impl RawReader for PosixRawReader {
             };
         }
         let buffer = buffer.replace("\r\n", "\n");
-        let buffer = buffer.replace("\r", "\n");
+        let buffer = buffer.replace('\r', "\n");
         Ok(buffer)
     }