Fix warnings, lints, and 2018 errors

3 files changed, 6 insertions, 6 deletions

diff --git a/ui/src/components/mail/view/envelope.rs b/ui/src/components/mail/view/envelope.rs
index 62467196..9893ca4a 100644
--- a/ui/src/components/mail/view/envelope.rs
+++ b/ui/src/components/mail/view/envelope.rs
@@ -336,7 +336,7 @@ impl Component for EnvelopeView {
                     let cursor_pos = if self.mode.is_attachment() {
                         Some(0)
                     } else {
-                        self.pager.as_mut().map(|p| p.cursor_pos())
+                        self.pager.as_ref().map(Pager::cursor_pos)
                     };
                     self.pager = Some(Pager::from_string(
                         text,
@@ -439,7 +439,7 @@ impl Component for EnvelopeView {
                                 let attachment_type = u.mime_type();
                                 let binary = query_default_app(&attachment_type);
                                 if let Ok(binary) = binary {
-                                    let mut p = create_temp_file(&decode(u, None), None);
+                                    let p = create_temp_file(&decode(u, None), None);
                                     Command::new(&binary)
                                         .arg(p.path())
                                         .stdin(Stdio::piped())
@@ -491,7 +491,7 @@ impl Component for EnvelopeView {
                 let url = {
                     let envelope: &Envelope = self.wrapper.envelope();
                     let finder = LinkFinder::new();
-                    let mut t = envelope
+                    let t = envelope
                         .body_bytes(self.wrapper.buffer())
                         .text()
                         .to_string();
diff --git a/ui/src/components/mail/view/html.rs b/ui/src/components/mail/view/html.rs
index 0c89db9e..1b80c7ac 100644
--- a/ui/src/components/mail/view/html.rs
+++ b/ui/src/components/mail/view/html.rs
@@ -132,7 +132,7 @@ impl Component for HtmlView {
             // scripts)
             let binary = query_default_app("text/html");
             if let Ok(binary) = binary {
-                let mut p = create_temp_file(&self.bytes, None);
+                let p = create_temp_file(&self.bytes, None);
                 Command::new(&binary)
                     .arg(p.path())
                     .stdin(Stdio::piped())
diff --git a/ui/src/components/mail/view/thread.rs b/ui/src/components/mail/view/thread.rs
index 7b1fca8c..ed6936bb 100644
--- a/ui/src/components/mail/view/thread.rs
+++ b/ui/src/components/mail/view/thread.rs
@@ -20,7 +20,7 @@
  */
 
 use super::*;
-use components::utilities::PageMovement;
+use crate::components::utilities::PageMovement;
 use std::cmp;
 
 const INDENTATION_COLORS: &'static [u8] = &[
@@ -916,7 +916,7 @@ impl Component for ThreadView {
                             .unwrap()
                     };
                     let envelope: &Envelope = &account.get_env(&i);
-                    let op = account.operation(&envelope.hash());
+                    let op = account.operation(envelope.hash());
                     debug!(
                         "sending action edit for {}, {}",
                         envelope.message_id(),