From a031151587446b39877d38dadf362920b4e9adee Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Tue, 23 Jun 2020 02:26:13 +0300 Subject: [PATCH] Fix two +nightly clippy suggestions --- src/chat.rs | 10 +++++----- src/peerstate.rs | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/chat.rs b/src/chat.rs index 957d1dfd3..988637ee6 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1001,13 +1001,13 @@ impl rusqlite::types::ToSql for ChatVisibility { impl rusqlite::types::FromSql for ChatVisibility { fn column_result(value: rusqlite::types::ValueRef) -> rusqlite::types::FromSqlResult { - i64::column_result(value).and_then(|val| { + i64::column_result(value).map(|val| { match val { - 2 => Ok(ChatVisibility::Pinned), - 1 => Ok(ChatVisibility::Archived), - 0 => Ok(ChatVisibility::Normal), + 2 => ChatVisibility::Pinned, + 1 => ChatVisibility::Archived, + 0 => ChatVisibility::Normal, // fallback to to Normal for unknown values, may happen eg. on imports created by a newer version. - _ => Ok(ChatVisibility::Normal), + _ => ChatVisibility::Normal, } }) } diff --git a/src/peerstate.rs b/src/peerstate.rs index 3bb16959a..8df0c7b4f 100644 --- a/src/peerstate.rs +++ b/src/peerstate.rs @@ -1,6 +1,5 @@ //! # [Autocrypt Peer State](https://autocrypt.org/level1.html#peer-state-management) module use std::collections::HashSet; -use std::convert::TryFrom; use std::fmt; use num_traits::FromPrimitive; @@ -324,11 +323,9 @@ impl<'a> Peerstate<'a> { pub fn render_gossip_header(&self, min_verified: PeerstateVerifiedStatus) -> Option { if let Some(key) = self.peek_key(min_verified) { - // TODO: avoid cloning - let public_key = SignedPublicKey::try_from(key.clone()).ok()?; let header = Aheader::new( self.addr.clone(), - public_key, + key.clone(), // TODO: avoid cloning // Autocrypt 1.1.0 specification says that // `prefer-encrypt` attribute SHOULD NOT be included, // but we include it anyway to propagate encryption