Fixing unused errors and unwraps

src/context.rs

@@ -70,7 +70,7 @@ impl Context {
     pub fn read_line<P: Into<String>>(
         &mut self,
         prompt: P,
-        mut handler: &mut EventHandler<RawTerminal<Stdout>>,
+        handler: &mut EventHandler<RawTerminal<Stdout>>,
     ) -> io::Result<String> {
         self.read_line_with_init_buffer(prompt, handler, Buffer::new())
     }
@@ -88,12 +88,12 @@ impl Context {
     pub fn read_line_with_init_buffer<P: Into<String>, B: Into<Buffer>>(
         &mut self,
         prompt: P,
-        mut handler: &mut EventHandler<RawTerminal<Stdout>>,
+        handler: &mut EventHandler<RawTerminal<Stdout>>,
         buffer: B,
     ) -> io::Result<String> {
         let res = {
-            let stdout = stdout().into_raw_mode().unwrap();
-            let ed = try!(Editor::new_with_init_buffer(stdout, prompt, self, buffer));
+            let stdout = stdout().into_raw_mode()?;
+            let ed = Editor::new_with_init_buffer(stdout, prompt, self, buffer)?;
             match self.key_bindings {
                 KeyBindings::Emacs => Self::handle_keys(keymap::Emacs::new(ed), handler),
                 KeyBindings::Vi => Self::handle_keys(keymap::Vi::new(ed), handler),
@@ -106,7 +106,7 @@ impl Context {
 
     fn handle_keys<'a, T, W: Write, M: KeyMap<'a, W, T>>(
         mut keymap: M,
-        mut handler: &mut EventHandler<W>,
+        handler: &mut EventHandler<W>,
     ) -> io::Result<String>
     where
         String: From<M>,

src/editor.rs

@@ -572,7 +572,7 @@ impl<'a, W: Write> Editor<'a, W> {
         if self.show_autosuggestions {
             {
                 let autosuggestion = self.current_autosuggestion().cloned();
-                let mut buf = self.current_buffer_mut();
+                let buf = self.current_buffer_mut();
                 if let Some(x) = autosuggestion {
                     buf.insert_from_buffer(&x);
                 }

src/history.rs

@@ -216,9 +216,6 @@ fn write_to_disk(max_file_size: usize, new_item: &Buffer, file_name: &str) -> io
         .create(true)
         .open(file_name)?;
 
-    // The metadata contains the length of the file
-    let file_length = file.metadata().ok().map_or(0u64, |m| m.len());
-
     {
         // Count number of entries in file
         let mut num_stored = 0;
@@ -277,7 +274,7 @@ fn write_to_disk(max_file_size: usize, new_item: &Buffer, file_name: &str) -> io
 
 
             // Move it all back
-            move_file_contents_backward(&mut file, move_dist);
+            move_file_contents_backward(&mut file, move_dist)?;
         }
     };
 
@@ -294,10 +291,10 @@ fn write_to_disk(max_file_size: usize, new_item: &Buffer, file_name: &str) -> io
 
 fn move_file_contents_backward(file: &mut File, distance: u64) -> io::Result<()> {
     let mut total_read = 0;
-    let mut buffer = [0u8, 4096];
+    let mut buffer = [0u8; 4096];
 
     file.seek(SeekFrom::Start(distance))?;
-    
+
     loop {
         // Read 4K of bytes all at once into the buffer.
         let read = file.read(&mut buffer)?;
@@ -307,15 +304,15 @@ fn move_file_contents_backward(file: &mut File, distance: u64) -> io::Result<()>
             break;
         }
 
-        file.seek(SeekFrom::Current(-(read as i64 + distance as i64)));
+        file.seek(SeekFrom::Current(-(read as i64 + distance as i64)))?;
 
 
         file.write_all(&buffer[..read])?;
-        file.seek(SeekFrom::Current(distance as i64));
+        file.seek(SeekFrom::Current(distance as i64))?;
     }
 
     file.set_len(total_read)?;
     file.flush()?;
 
     Ok(())
-}
+}