clippy

8 files changed, 29 insertions, 28 deletions

diff --git a/src/client.rs b/src/client.rs
index a6e897f..254940c 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -214,7 +214,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
         self.send_message(crate::protocol::Message::login(
             &self.auth,
             &self.term_type,
-            &crate::term::Size::get()?,
+            crate::term::Size::get()?,
         ));
 
         Ok(())
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs
index 84af32d..11d3873 100644
--- a/src/cmd/stream.rs
+++ b/src/cmd/stream.rs
@@ -265,7 +265,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                 size: (rows, cols),
             }) => {
                 self.client.send_message(crate::protocol::Message::resize(
-                    &crate::term::Size { rows, cols },
+                    crate::term::Size { rows, cols },
                 ));
             }
             None => {
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
index f0d1929..b872706 100644
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -522,7 +522,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                 "".to_string()
             };
             let display_size_plain = format!("{}", &session.size);
-            let display_size_full = if &session.size == sessions.size() {
+            let display_size_full = if session.size == sessions.size() {
                 // XXX i should be able to use crossterm::style here, but
                 // it has bugs
                 format!("\x1b[32m{}\x1b[m", display_size_plain)
diff --git a/src/main.rs b/src/main.rs
index fe9b98e..a687c86 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@
 #![allow(clippy::single_match)]
 #![allow(clippy::single_match_else)]
 #![allow(clippy::too_many_arguments)]
+#![allow(clippy::too_many_lines)]
 #![allow(clippy::type_complexity)]
 
 const _DUMMY_DEPENDENCY: &str = include_str!("../Cargo.toml");
diff --git a/src/protocol.rs b/src/protocol.rs
index 299812a..58fa396 100644
--- a/src/protocol.rs
+++ b/src/protocol.rs
@@ -226,13 +226,13 @@ impl Message {
     pub fn login(
         auth: &Auth,
         term_type: &str,
-        size: &crate::term::Size,
+        size: crate::term::Size,
     ) -> Self {
         Self::Login {
             proto_version: PROTO_VERSION,
             auth: auth.clone(),
             term_type: term_type.to_string(),
-            size: size.clone(),
+            size,
         }
     }
 
@@ -274,8 +274,8 @@ impl Message {
         }
     }
 
-    pub fn resize(size: &crate::term::Size) -> Self {
-        Self::Resize { size: size.clone() }
+    pub fn resize(size: crate::term::Size) -> Self {
+        Self::Resize { size }
     }
 
     pub fn logged_in(username: &str) -> Self {
@@ -466,7 +466,7 @@ impl From<&Message> for Packet {
         fn write_str(val: &str, data: &mut Vec<u8>) {
             write_bytes(val.as_bytes(), data);
         }
-        fn write_size(val: &crate::term::Size, data: &mut Vec<u8>) {
+        fn write_size(val: crate::term::Size, data: &mut Vec<u8>) {
             write_u16(val.rows, data);
             write_u16(val.cols, data);
         }
@@ -474,7 +474,7 @@ impl From<&Message> for Packet {
             write_str(&val.id, data);
             write_str(&val.username, data);
             write_str(&val.term_type, data);
-            write_size(&val.size, data);
+            write_size(val.size, data);
             write_u32(val.idle_time, data);
             write_str(&val.title, data);
             write_u32(val.watchers, data);
@@ -511,7 +511,7 @@ impl From<&Message> for Packet {
                 write_u8(*proto_version, &mut data);
                 write_auth(auth, &mut data);
                 write_str(term_type, &mut data);
-                write_size(size, &mut data);
+                write_size(*size, &mut data);
             }
             Message::StartStreaming => {}
             Message::StartWatching { id } => {
@@ -530,7 +530,7 @@ impl From<&Message> for Packet {
                 write_str(msg, &mut data);
             }
             Message::Resize { size } => {
-                write_size(size, &mut data);
+                write_size(*size, &mut data);
             }
             Message::LoggedIn { username } => {
                 write_str(username, &mut data);
@@ -874,19 +874,19 @@ mod test {
                     username: "doy".to_string(),
                 },
                 "screen",
-                &crate::term::Size { rows: 24, cols: 80 },
+                crate::term::Size { rows: 24, cols: 80 },
             ),
             Message::login(
                 &Auth::RecurseCenter {
                     id: Some("some-random-id".to_string()),
                 },
                 "screen",
-                &crate::term::Size { rows: 24, cols: 80 },
+                crate::term::Size { rows: 24, cols: 80 },
             ),
             Message::login(
                 &Auth::RecurseCenter { id: None },
                 "screen",
-                &crate::term::Size { rows: 24, cols: 80 },
+                crate::term::Size { rows: 24, cols: 80 },
             ),
             Message::start_streaming(),
             Message::start_watching("some-session-id"),
@@ -926,7 +926,7 @@ mod test {
             ]),
             Message::disconnected(),
             Message::error("error message"),
-            Message::resize(&crate::term::Size { rows: 25, cols: 81 }),
+            Message::resize(crate::term::Size { rows: 25, cols: 81 }),
             Message::logged_in("doy"),
         ]
     }
diff --git a/src/server.rs b/src/server.rs
index 51ca6e4..4dcd914 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -132,14 +132,14 @@ impl ConnectionState {
         &mut self,
         username: &str,
         term_type: &str,
-        size: &crate::term::Size,
+        size: crate::term::Size,
     ) {
         if let Self::Accepted = self {
             *self = Self::LoggedIn {
                 username: username.to_string(),
                 term_info: TerminalInfo {
                     term: term_type.to_string(),
-                    size: size.clone(),
+                    size,
                 },
             };
         } else {
@@ -150,7 +150,7 @@ impl ConnectionState {
     fn login_oauth(
         &mut self,
         term_type: &str,
-        size: &crate::term::Size,
+        size: crate::term::Size,
         username: &str,
     ) {
         if let Self::Accepted = self {
@@ -158,7 +158,7 @@ impl ConnectionState {
                 username: username.to_string(),
                 term_info: TerminalInfo {
                     term: term_type.to_string(),
-                    size: size.clone(),
+                    size,
                 },
             };
         } else {
@@ -169,13 +169,13 @@ impl ConnectionState {
     fn login_oauth_start(
         &mut self,
         term_type: &str,
-        size: &crate::term::Size,
+        size: crate::term::Size,
     ) {
         if let Self::Accepted = self {
             *self = Self::LoggingIn {
                 term_info: TerminalInfo {
                     term: term_type.to_string(),
-                    size: size.clone(),
+                    size,
                 },
             };
         } else {
@@ -295,7 +295,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
             id: self.id.clone(),
             username: username.clone(),
             term_type: term_info.term.clone(),
-            size: term_info.size.clone(),
+            size: term_info.size,
             idle_time: std::time::Instant::now()
                 .duration_since(self.last_activity)
                 .as_secs() as u32,
@@ -398,7 +398,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                     conn.id,
                     username
                 );
-                conn.state.login_plain(username, term_type, &size);
+                conn.state.login_plain(username, term_type, size);
                 conn.send_message(crate::protocol::Message::logged_in(
                     username,
                 ));
@@ -464,7 +464,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                         })
                         .map(move |username| {
                             new_state
-                                .login_oauth(&term_type, &size, &username);
+                                .login_oauth(&term_type, size, &username);
                             (
                                 new_state,
                                 crate::protocol::Message::logged_in(
@@ -474,7 +474,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                         });
                     return Ok(Some(Box::new(fut)));
                 } else {
-                    conn.state.login_oauth_start(term_type, &size);
+                    conn.state.login_oauth_start(term_type, size);
                     let authorize_url = client.generate_authorize_url();
                     let user_id = client.user_id().to_string();
                     conn.send_message(
diff --git a/src/session_list.rs b/src/session_list.rs
index 9ce6b79..7fd4d0a 100644
--- a/src/session_list.rs
+++ b/src/session_list.rs
@@ -63,8 +63,8 @@ impl SessionList {
             .map(move |(i, s)| (self.idx_to_char(i).unwrap(), s))
     }
 
-    pub fn size(&self) -> &crate::term::Size {
-        &self.size
+    pub fn size(&self) -> crate::term::Size {
+        self.size
     }
 
     pub fn resize(&mut self, size: crate::term::Size) {
diff --git a/src/term.rs b/src/term.rs
index 72238a9..3561521 100644
--- a/src/term.rs
+++ b/src/term.rs
@@ -19,7 +19,7 @@ impl Size {
         Ok(Self { rows, cols })
     }
 
-    pub fn fits_in(&self, other: &Self) -> bool {
+    pub fn fits_in(self, other: Self) -> bool {
         self.rows <= other.rows && self.cols <= other.cols
     }
 }