jmap: fix warnings

melib/src/backends/jmap.rs

@@ -22,16 +22,12 @@
 use crate::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext};
 use crate::backends::BackendOp;
 use crate::backends::FolderHash;
-use crate::backends::RefreshEvent;
-use crate::backends::RefreshEventKind::{self, *};
 use crate::backends::{BackendFolder, Folder, FolderOperation, MailBackend, RefreshEventConsumer};
 use crate::conf::AccountSettings;
 use crate::email::*;
 use crate::error::{MeliError, Result};
-use fnv::{FnvHashMap, FnvHashSet};
+use fnv::FnvHashMap;
 use reqwest::blocking::Client;
-use std::collections::hash_map::DefaultHasher;
-use std::hash::Hasher;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, RwLock};
 
@@ -221,8 +217,8 @@ impl MailBackend for JmapType {
 
     fn watch(
         &self,
-        sender: RefreshEventConsumer,
-        work_context: WorkContext,
+        _sender: RefreshEventConsumer,
+        _work_context: WorkContext,
     ) -> Result<std::thread::ThreadId> {
         Err(MeliError::from("sadfsa"))
     }
@@ -255,11 +251,11 @@ impl MailBackend for JmapType {
         ))
     }
 
-    fn save(&self, bytes: &[u8], folder: &str, flags: Option<Flag>) -> Result<()> {
+    fn save(&self, _bytes: &[u8], _folder: &str, _flags: Option<Flag>) -> Result<()> {
         Ok(())
     }
 
-    fn folder_operation(&mut self, path: &str, op: FolderOperation) -> Result<()> {
+    fn folder_operation(&mut self, _path: &str, _op: FolderOperation) -> Result<()> {
         Ok(())
     }
 

melib/src/backends/jmap/objects/email.rs

@@ -20,7 +20,6 @@
  */
 
 use super::*;
-use crate::backends::jmap::protocol::*;
 use crate::backends::jmap::rfc8620::bool_false;
 use core::marker::PhantomData;
 use serde::de::{Deserialize, Deserializer};
@@ -152,7 +151,7 @@ pub struct EmailObject {
     #[serde(default)]
     in_reply_to_email_id: Id,
     #[serde(default)]
-    keywords: Value,
+    keywords: HashMap<String, bool>,
     #[serde(default)]
     attached_emails: Option<Id>,
     #[serde(default)]

melib/src/backends/jmap/operations.rs

@@ -22,8 +22,7 @@
 use super::*;
 
 use crate::backends::BackendOp;
-use crate::email::*;
-use crate::error::{MeliError, Result};
+use crate::error::Result;
 use std::cell::Cell;
 use std::sync::{Arc, RwLock};
 
@@ -92,7 +91,7 @@ impl BackendOp for JmapOp {
         Flag::default()
     }
 
-    fn set_flag(&mut self, _envelope: &mut Envelope, f: Flag, value: bool) -> Result<()> {
+    fn set_flag(&mut self, _envelope: &mut Envelope, _f: Flag, _value: bool) -> Result<()> {
         Ok(())
     }
 

melib/src/backends/jmap/protocol.rs

@@ -21,7 +21,7 @@
 
 use super::folder::JmapFolder;
 use super::*;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::Serialize;
 use serde_json::{json, Value};
 use std::convert::TryFrom;
 
@@ -175,7 +175,6 @@ pub struct JsonResponse<'a> {
 }
 
 pub fn get_message_list(conn: &JmapConnection, folder: &JmapFolder) -> Result<Vec<String>> {
-    let seq = get_request_no!(conn.request_no);
     let email_call: EmailQueryCall = EmailQueryCall {
         filter: EmailFilterCondition::new().in_mailbox(Some(folder.id.clone())),
         collapse_threads: false,
@@ -205,7 +204,6 @@ pub fn get_message_list(conn: &JmapConnection, folder: &JmapFolder) -> Result<Ve
 }
 
 pub fn get_message(conn: &JmapConnection, ids: &[String]) -> Result<Vec<Envelope>> {
-    let seq = get_request_no!(conn.request_no);
     let email_call: EmailGet = EmailGet::new(
         Get::new()
             .ids(Some(JmapArgument::value(
@@ -267,7 +265,6 @@ pub fn get(
         Get::new()
             .ids(Some(JmapArgument::reference(
                 prev_seq,
-                &email_query_call,
                 EmailQueryCall::RESULT_FIELD_IDS,
             )))
             .account_id(conn.account_id.lock().unwrap().clone()),

melib/src/backends/jmap/rfc8620.rs

@@ -32,7 +32,7 @@ pub use comparator::*;
 mod argument;
 pub use argument::*;
 
-use super::protocol::{Method, Response};
+use super::protocol::Method;
 use std::collections::HashMap;
 pub trait Object {
     const NAME: &'static str;
@@ -196,7 +196,7 @@ impl<OBJ: Object + Serialize + std::fmt::Debug> Serialize for Get<OBJ> {
         }
 
         if !self.properties.is_none() {
-            state.serialize_field("properties", self.properties.as_ref().unwrap());
+            state.serialize_field("properties", self.properties.as_ref().unwrap())?;
         }
 
         state.end()

melib/src/backends/jmap/rfc8620/argument.rs

@@ -22,8 +22,6 @@
 use crate::backends::jmap::protocol::Method;
 use crate::backends::jmap::rfc8620::Object;
 use crate::backends::jmap::rfc8620::ResultField;
-use serde::de::DeserializeOwned;
-use serde::ser::{Serialize, SerializeStruct, Serializer};
 
 #[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
@@ -41,7 +39,7 @@ impl<T> JmapArgument<T> {
         JmapArgument::Value(v)
     }
 
-    pub fn reference<M, OBJ>(result_of: usize, method: &M, path: ResultField<M, OBJ>) -> Self
+    pub fn reference<M, OBJ>(result_of: usize, path: ResultField<M, OBJ>) -> Self
     where
         M: Method<OBJ>,
         OBJ: Object,