Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up imports

Browse Source
This commit is contained in:
Floris Bruynooghe
2021-01-31 12:30:36 +01:00
parent 002ea8ed98
commit 5ee4bb58cd
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/context.rs
View File

@@ -1,15 +1,13 @@
//! Context module //! Context module
use std::collections::{BTreeMap, HashMap};
use std::ffi::OsString; use std::ffi::OsString;
use std::ops::Deref; use std::ops::Deref;
use std::{ use std::time::{Instant, SystemTime};
collections::{BTreeMap, HashMap},
time::Instant,
};
use anyhow::{bail, ensure, Result}; use anyhow::{bail, ensure, Result};
use async_std::{ use async_std::{
channel::{bounded as channel, Receiver, Sender}, channel::{self, Receiver, Sender},
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::{Arc, Mutex, RwLock}, sync::{Arc, Mutex, RwLock},
task, task,
@@ -27,7 +25,6 @@ use crate::message::{self, MsgId};
use crate::scheduler::Scheduler; use crate::scheduler::Scheduler;
use crate::securejoin::Bob; use crate::securejoin::Bob;
use crate::sql::Sql; use crate::sql::Sql;
use std::time::SystemTime;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Context { pub struct Context {
@@ -225,7 +222,7 @@ impl Context {
s.ongoing_running = true; s.ongoing_running = true;
s.shall_stop_ongoing = false; s.shall_stop_ongoing = false;
let (sender, receiver) = channel(1); let (sender, receiver) = channel::bounded(1);
s.cancel_sender = Some(sender); s.cancel_sender = Some(sender);
Ok(receiver) Ok(receiver)

4
src/events.rs
View File

@@ -2,7 +2,7 @@
use std::ops::Deref; use std::ops::Deref;
use async_std::channel::{bounded as channel, Receiver, Sender, TrySendError}; use async_std::channel::{self, Receiver, Sender, TrySendError};
use async_std::path::PathBuf; use async_std::path::PathBuf;
use strum::EnumProperty; use strum::EnumProperty;
@@ -18,7 +18,7 @@ pub struct Events {
impl Default for Events { impl Default for Events {
fn default() -> Self { fn default() -> Self {
let (sender, receiver) = channel(1_000); let (sender, receiver) = channel::bounded(1_000);
Self { receiver, sender } Self { receiver, sender }
} }

26
src/scheduler.rs
View File

@@ -1,14 +1,16 @@
use async_std::prelude::*; use async_std::prelude::*;
use async_std::{ use async_std::{
channel::{bounded as channel, Receiver, Sender}, channel::{self, Receiver, Sender},
task, task,
}; };
use crate::config::Config;
use crate::context::Context; use crate::context::Context;
use crate::dc_tools::maybe_add_time_based_warnings; use crate::dc_tools::maybe_add_time_based_warnings;
use crate::imap::Imap; use crate::imap::Imap;
use crate::job::{self, Thread}; use crate::job::{self, Thread};
use crate::{config::Config, message::MsgId, smtp::Smtp}; use crate::message::MsgId;
use crate::smtp::Smtp;
pub(crate) struct StopToken; pub(crate) struct StopToken;
@@ -277,12 +279,12 @@ impl Scheduler {
let (smtp, smtp_handlers) = SmtpConnectionState::new(); let (smtp, smtp_handlers) = SmtpConnectionState::new();
let (inbox, inbox_handlers) = ImapConnectionState::new(); let (inbox, inbox_handlers) = ImapConnectionState::new();
let (inbox_start_send, inbox_start_recv) = channel(1); let (inbox_start_send, inbox_start_recv) = channel::bounded(1);
let (mvbox_start_send, mvbox_start_recv) = channel(1); let (mvbox_start_send, mvbox_start_recv) = channel::bounded(1);
let mut mvbox_handle = None; let mut mvbox_handle = None;
let (sentbox_start_send, sentbox_start_recv) = channel(1); let (sentbox_start_send, sentbox_start_recv) = channel::bounded(1);
let mut sentbox_handle = None; let mut sentbox_handle = None;
let (smtp_start_send, smtp_start_recv) = channel(1); let (smtp_start_send, smtp_start_recv) = channel::bounded(1);
let inbox_handle = { let inbox_handle = {
let ctx = ctx.clone(); let ctx = ctx.clone();
@@ -503,9 +505,9 @@ pub(crate) struct SmtpConnectionState {
impl SmtpConnectionState { impl SmtpConnectionState {
fn new() -> (Self, SmtpConnectionHandlers) { fn new() -> (Self, SmtpConnectionHandlers) {
let (stop_sender, stop_receiver) = channel(1); let (stop_sender, stop_receiver) = channel::bounded(1);
let (shutdown_sender, shutdown_receiver) = channel(1); let (shutdown_sender, shutdown_receiver) = channel::bounded(1);
let (idle_interrupt_sender, idle_interrupt_receiver) = channel(1); let (idle_interrupt_sender, idle_interrupt_receiver) = channel::bounded(1);
let handlers = SmtpConnectionHandlers { let handlers = SmtpConnectionHandlers {
connection: Smtp::new(), connection: Smtp::new(),
@@ -551,9 +553,9 @@ pub(crate) struct ImapConnectionState {
impl ImapConnectionState { impl ImapConnectionState {
/// Construct a new connection. /// Construct a new connection.
fn new() -> (Self, ImapConnectionHandlers) { fn new() -> (Self, ImapConnectionHandlers) {
let (stop_sender, stop_receiver) = channel(1); let (stop_sender, stop_receiver) = channel::bounded(1);
let (shutdown_sender, shutdown_receiver) = channel(1); let (shutdown_sender, shutdown_receiver) = channel::bounded(1);
let (idle_interrupt_sender, idle_interrupt_receiver) = channel(1); let (idle_interrupt_sender, idle_interrupt_receiver) = channel::bounded(1);
let handlers = ImapConnectionHandlers { let handlers = ImapConnectionHandlers {
connection: Imap::new(idle_interrupt_receiver), connection: Imap::new(idle_interrupt_receiver),