aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-06-29 12:52:58 +0200
committerAlex Auvolat <alex@adnab.me>2022-06-29 12:52:58 +0200
commit3cf91429c7eb675639fbcbf006e04d790645cf77 (patch)
treefcf9590a98955063a63c5fcc58f4ae9764da1a28
parent90b143e1c57c6561998176878b2cc586b2d89c80 (diff)
downloadaerogramme-3cf91429c7eb675639fbcbf006e04d790645cf77.tar.gz
aerogramme-3cf91429c7eb675639fbcbf006e04d790645cf77.zip
Clean up unused imports
-rw-r--r--src/imap/command/anonymous.rs4
-rw-r--r--src/imap/command/authenticated.rs14
-rw-r--r--src/imap/command/selected.rs14
-rw-r--r--src/imap/mod.rs4
-rw-r--r--src/imap/session.rs4
-rw-r--r--src/lmtp.rs12
-rw-r--r--src/mail/mod.rs4
-rw-r--r--src/mail/uidindex.rs4
-rw-r--r--src/main.rs2
-rw-r--r--src/server.rs4
10 files changed, 33 insertions, 33 deletions
diff --git a/src/imap/command/anonymous.rs b/src/imap/command/anonymous.rs
index f5707ef..7e72458 100644
--- a/src/imap/command/anonymous.rs
+++ b/src/imap/command/anonymous.rs
@@ -1,8 +1,8 @@
use anyhow::{Error, Result};
use boitalettres::proto::{res::body::Data as Body, Request, Response};
use imap_codec::types::command::CommandBody;
-use imap_codec::types::core::{AString, Atom};
-use imap_codec::types::response::{Capability, Code, Data, Response as ImapRes, Status};
+use imap_codec::types::core::{AString};
+use imap_codec::types::response::{Capability, Data, Status};
use crate::imap::flow;
use crate::login::ArcLoginProvider;
diff --git a/src/imap/command/authenticated.rs b/src/imap/command/authenticated.rs
index c7e5642..392069f 100644
--- a/src/imap/command/authenticated.rs
+++ b/src/imap/command/authenticated.rs
@@ -1,14 +1,14 @@
-use anyhow::{anyhow, Error, Result};
+use anyhow::{Error, Result};
use boitalettres::proto::{res::body::Data as Body, Request, Response};
use imap_codec::types::command::CommandBody;
use imap_codec::types::core::Atom;
use imap_codec::types::flag::Flag;
use imap_codec::types::mailbox::{ListMailbox, Mailbox as MailboxCodec};
-use imap_codec::types::response::{Code, Data, Response as ImapRes, Status};
+use imap_codec::types::response::{Code, Data, Status};
use crate::imap::command::anonymous;
use crate::imap::flow;
-use crate::imap::session::InnerContext;
+
use crate::mail::Mailbox;
const DEFAULT_FLAGS: [Flag; 5] = [
@@ -50,16 +50,16 @@ pub async fn dispatch<'a>(ctx: AuthenticatedContext<'a>) -> Result<(Response, fl
impl<'a> AuthenticatedContext<'a> {
async fn lsub(
self,
- reference: &MailboxCodec,
- mailbox_wildcard: &ListMailbox,
+ _reference: &MailboxCodec,
+ _mailbox_wildcard: &ListMailbox,
) -> Result<(Response, flow::Transition)> {
Ok((Response::bad("Not implemented")?, flow::Transition::None))
}
async fn list(
self,
- reference: &MailboxCodec,
- mailbox_wildcard: &ListMailbox,
+ _reference: &MailboxCodec,
+ _mailbox_wildcard: &ListMailbox,
) -> Result<(Response, flow::Transition)> {
Ok((Response::bad("Not implemented")?, flow::Transition::None))
}
diff --git a/src/imap/command/selected.rs b/src/imap/command/selected.rs
index 4e41561..d3dddd4 100644
--- a/src/imap/command/selected.rs
+++ b/src/imap/command/selected.rs
@@ -1,15 +1,15 @@
-use anyhow::{Error, Result};
+use anyhow::{Result};
use boitalettres::proto::Request;
use boitalettres::proto::Response;
use imap_codec::types::command::CommandBody;
-use imap_codec::types::core::Tag;
+
use imap_codec::types::fetch_attributes::MacroOrFetchAttributes;
-use imap_codec::types::response::{Response as ImapRes, Status};
+
use imap_codec::types::sequence::SequenceSet;
use crate::imap::command::authenticated;
use crate::imap::flow;
-use crate::imap::session::InnerContext;
+
use crate::mail::Mailbox;
pub struct SelectedContext<'a> {
@@ -40,9 +40,9 @@ pub async fn dispatch<'a>(ctx: SelectedContext<'a>) -> Result<(Response, flow::T
impl<'a> SelectedContext<'a> {
pub async fn fetch(
self,
- sequence_set: &SequenceSet,
- attributes: &MacroOrFetchAttributes,
- uid: &bool,
+ _sequence_set: &SequenceSet,
+ _attributes: &MacroOrFetchAttributes,
+ _uid: &bool,
) -> Result<(Response, flow::Transition)> {
Ok((Response::bad("Not implemented")?, flow::Transition::None))
}
diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index b725859..0e9f49a 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -61,7 +61,7 @@ impl<'a> Service<&'a AddrStream> for Instance {
type Error = anyhow::Error;
type Future = BoxFuture<'static, Result<Self::Response>>;
- fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+ fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}
@@ -93,7 +93,7 @@ impl Service<Request> for Connection {
type Error = BalError;
type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
- fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+ fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(()))
}
diff --git a/src/imap/session.rs b/src/imap/session.rs
index 72dd9d8..b7e2059 100644
--- a/src/imap/session.rs
+++ b/src/imap/session.rs
@@ -3,7 +3,7 @@ use boitalettres::errors::Error as BalError;
use boitalettres::proto::{Request, Response};
use futures::future::BoxFuture;
use futures::future::FutureExt;
-use imap_codec::types::response::{Response as ImapRes, Status};
+
use tokio::sync::mpsc::error::TrySendError;
use tokio::sync::{mpsc, oneshot};
@@ -32,7 +32,7 @@ impl Manager {
pub fn new(login_provider: ArcLoginProvider) -> Self {
let (tx, rx) = mpsc::channel(MAX_PIPELINED_COMMANDS);
tokio::spawn(async move {
- let mut instance = Instance::new(login_provider, rx);
+ let instance = Instance::new(login_provider, rx);
instance.start().await;
});
Self { tx }
diff --git a/src/lmtp.rs b/src/lmtp.rs
index 29d61af..9036874 100644
--- a/src/lmtp.rs
+++ b/src/lmtp.rs
@@ -2,20 +2,20 @@ use std::collections::HashMap;
use std::net::SocketAddr;
use std::{pin::Pin, sync::Arc};
-use anyhow::{bail, Result};
+use anyhow::{Result};
use async_trait::async_trait;
use duplexify::Duplex;
use futures::{io, AsyncRead, AsyncReadExt, AsyncWrite};
use futures::{stream, stream::FuturesUnordered, StreamExt};
use log::*;
-use rusoto_s3::{PutObjectRequest, S3Client, S3};
-use tokio::net::{TcpListener, TcpStream};
+use rusoto_s3::{PutObjectRequest, S3};
+use tokio::net::{TcpListener};
use tokio::select;
use tokio::sync::watch;
use tokio_util::compat::*;
use smtp_message::{Email, EscapedDataReader, Reply, ReplyCode};
-use smtp_server::{reply, Config, ConnectionMetadata, Decision, MailMetadata, Protocol};
+use smtp_server::{reply, Config, ConnectionMetadata, Decision, MailMetadata};
use crate::config::*;
use crate::cryptoblob::*;
@@ -120,7 +120,7 @@ impl Config for LmtpServer {
async fn filter_from(
&self,
from: Option<Email>,
- meta: &mut MailMetadata<Message>,
+ _meta: &mut MailMetadata<Message>,
_conn_meta: &mut ConnectionMetadata<Conn>,
) -> Decision<Option<Email>> {
Decision::Accept {
@@ -161,7 +161,7 @@ impl Config for LmtpServer {
&'resp self,
reader: &mut EscapedDataReader<'_, R>,
meta: MailMetadata<Message>,
- conn_meta: &'resp mut ConnectionMetadata<Conn>,
+ _conn_meta: &'resp mut ConnectionMetadata<Conn>,
) -> Pin<Box<dyn futures::Stream<Item = Decision<()>> + Send + 'resp>>
where
R: Send + Unpin + AsyncRead,
diff --git a/src/mail/mod.rs b/src/mail/mod.rs
index 7c62c59..a130073 100644
--- a/src/mail/mod.rs
+++ b/src/mail/mod.rs
@@ -88,13 +88,13 @@ impl Mailbox {
}
// Insert an email in the mailbox
- pub async fn append(&mut self, msg: IMF) -> Result<()> {
+ pub async fn append(&mut self, _msg: IMF) -> Result<()> {
Ok(())
}
// Copy an email from an external to this mailbox
// @FIXME is it needed or could we implement it with append?
- pub async fn copy(&mut self, mailbox: String, uid: ImapUid) -> Result<()> {
+ pub async fn copy(&mut self, _mailbox: String, _uid: ImapUid) -> Result<()> {
Ok(())
}
diff --git a/src/mail/uidindex.rs b/src/mail/uidindex.rs
index 1e78d54..9ffa386 100644
--- a/src/mail/uidindex.rs
+++ b/src/mail/uidindex.rs
@@ -1,7 +1,7 @@
use std::num::NonZeroU32;
-use im::{HashMap, HashSet, OrdMap, OrdSet};
-use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
+use im::{HashMap, OrdMap, OrdSet};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
use crate::bayou::*;
use crate::mail::mail_ident::MailIdent;
diff --git a/src/main.rs b/src/main.rs
index e328fb1..401ed53 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -134,7 +134,7 @@ async fn main() -> Result<()> {
Command::Test { config_file } => {
let config = read_config(config_file)?;
- let server = Server::new(config).await?;
+ let _server = Server::new(config).await?;
//server.test().await?;
}
Command::FirstLogin {
diff --git a/src/server.rs b/src/server.rs
index 9b83ad4..2cc481c 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -10,7 +10,7 @@ use crate::config::*;
use crate::imap;
use crate::lmtp::*;
use crate::login::ArcLoginProvider;
-use crate::login::{ldap_provider::*, static_provider::*, *};
+use crate::login::{ldap_provider::*, static_provider::*};
pub struct Server {
lmtp_server: Option<Arc<LmtpServer>>,
@@ -37,7 +37,7 @@ impl Server {
tracing::info!("Starting Aerogramme...");
let (exit_signal, provoke_exit) = watch_ctrl_c();
- let exit_on_err = move |err: anyhow::Error| {
+ let _exit_on_err = move |err: anyhow::Error| {
error!("Error: {}", err);
let _ = provoke_exit.send(true);
};