jmap: fix warnings
parent
275c9f421f
commit
30e9114d9c
|
@ -22,16 +22,12 @@
|
||||||
use crate::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext};
|
use crate::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext};
|
||||||
use crate::backends::BackendOp;
|
use crate::backends::BackendOp;
|
||||||
use crate::backends::FolderHash;
|
use crate::backends::FolderHash;
|
||||||
use crate::backends::RefreshEvent;
|
|
||||||
use crate::backends::RefreshEventKind::{self, *};
|
|
||||||
use crate::backends::{BackendFolder, Folder, FolderOperation, MailBackend, RefreshEventConsumer};
|
use crate::backends::{BackendFolder, Folder, FolderOperation, MailBackend, RefreshEventConsumer};
|
||||||
use crate::conf::AccountSettings;
|
use crate::conf::AccountSettings;
|
||||||
use crate::email::*;
|
use crate::email::*;
|
||||||
use crate::error::{MeliError, Result};
|
use crate::error::{MeliError, Result};
|
||||||
use fnv::{FnvHashMap, FnvHashSet};
|
use fnv::FnvHashMap;
|
||||||
use reqwest::blocking::Client;
|
use reqwest::blocking::Client;
|
||||||
use std::collections::hash_map::DefaultHasher;
|
|
||||||
use std::hash::Hasher;
|
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::sync::{Arc, Mutex, RwLock};
|
use std::sync::{Arc, Mutex, RwLock};
|
||||||
|
|
||||||
|
@ -221,8 +217,8 @@ impl MailBackend for JmapType {
|
||||||
|
|
||||||
fn watch(
|
fn watch(
|
||||||
&self,
|
&self,
|
||||||
sender: RefreshEventConsumer,
|
_sender: RefreshEventConsumer,
|
||||||
work_context: WorkContext,
|
_work_context: WorkContext,
|
||||||
) -> Result<std::thread::ThreadId> {
|
) -> Result<std::thread::ThreadId> {
|
||||||
Err(MeliError::from("sadfsa"))
|
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(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn folder_operation(&mut self, path: &str, op: FolderOperation) -> Result<()> {
|
fn folder_operation(&mut self, _path: &str, _op: FolderOperation) -> Result<()> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::backends::jmap::protocol::*;
|
|
||||||
use crate::backends::jmap::rfc8620::bool_false;
|
use crate::backends::jmap::rfc8620::bool_false;
|
||||||
use core::marker::PhantomData;
|
use core::marker::PhantomData;
|
||||||
use serde::de::{Deserialize, Deserializer};
|
use serde::de::{Deserialize, Deserializer};
|
||||||
|
@ -152,7 +151,7 @@ pub struct EmailObject {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
in_reply_to_email_id: Id,
|
in_reply_to_email_id: Id,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
keywords: Value,
|
keywords: HashMap<String, bool>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
attached_emails: Option<Id>,
|
attached_emails: Option<Id>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
|
|
|
@ -22,8 +22,7 @@
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
use crate::backends::BackendOp;
|
use crate::backends::BackendOp;
|
||||||
use crate::email::*;
|
use crate::error::Result;
|
||||||
use crate::error::{MeliError, Result};
|
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use std::sync::{Arc, RwLock};
|
use std::sync::{Arc, RwLock};
|
||||||
|
|
||||||
|
@ -92,7 +91,7 @@ impl BackendOp for JmapOp {
|
||||||
Flag::default()
|
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(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
use super::folder::JmapFolder;
|
use super::folder::JmapFolder;
|
||||||
use super::*;
|
use super::*;
|
||||||
use serde::{de::DeserializeOwned, Serialize};
|
use serde::Serialize;
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
|
|
||||||
|
@ -175,7 +175,6 @@ pub struct JsonResponse<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_message_list(conn: &JmapConnection, folder: &JmapFolder) -> Result<Vec<String>> {
|
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 {
|
let email_call: EmailQueryCall = EmailQueryCall {
|
||||||
filter: EmailFilterCondition::new().in_mailbox(Some(folder.id.clone())),
|
filter: EmailFilterCondition::new().in_mailbox(Some(folder.id.clone())),
|
||||||
collapse_threads: false,
|
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>> {
|
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(
|
let email_call: EmailGet = EmailGet::new(
|
||||||
Get::new()
|
Get::new()
|
||||||
.ids(Some(JmapArgument::value(
|
.ids(Some(JmapArgument::value(
|
||||||
|
@ -267,7 +265,6 @@ pub fn get(
|
||||||
Get::new()
|
Get::new()
|
||||||
.ids(Some(JmapArgument::reference(
|
.ids(Some(JmapArgument::reference(
|
||||||
prev_seq,
|
prev_seq,
|
||||||
&email_query_call,
|
|
||||||
EmailQueryCall::RESULT_FIELD_IDS,
|
EmailQueryCall::RESULT_FIELD_IDS,
|
||||||
)))
|
)))
|
||||||
.account_id(conn.account_id.lock().unwrap().clone()),
|
.account_id(conn.account_id.lock().unwrap().clone()),
|
||||||
|
|
|
@ -32,7 +32,7 @@ pub use comparator::*;
|
||||||
mod argument;
|
mod argument;
|
||||||
pub use argument::*;
|
pub use argument::*;
|
||||||
|
|
||||||
use super::protocol::{Method, Response};
|
use super::protocol::Method;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
pub trait Object {
|
pub trait Object {
|
||||||
const NAME: &'static str;
|
const NAME: &'static str;
|
||||||
|
@ -196,7 +196,7 @@ impl<OBJ: Object + Serialize + std::fmt::Debug> Serialize for Get<OBJ> {
|
||||||
}
|
}
|
||||||
|
|
||||||
if !self.properties.is_none() {
|
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()
|
state.end()
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
use crate::backends::jmap::protocol::Method;
|
use crate::backends::jmap::protocol::Method;
|
||||||
use crate::backends::jmap::rfc8620::Object;
|
use crate::backends::jmap::rfc8620::Object;
|
||||||
use crate::backends::jmap::rfc8620::ResultField;
|
use crate::backends::jmap::rfc8620::ResultField;
|
||||||
use serde::de::DeserializeOwned;
|
|
||||||
use serde::ser::{Serialize, SerializeStruct, Serializer};
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Debug)]
|
#[derive(Deserialize, Serialize, Debug)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
|
@ -41,7 +39,7 @@ impl<T> JmapArgument<T> {
|
||||||
JmapArgument::Value(v)
|
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
|
where
|
||||||
M: Method<OBJ>,
|
M: Method<OBJ>,
|
||||||
OBJ: Object,
|
OBJ: Object,
|
||||||
|
|
Loading…
Reference in New Issue