diff --git a/src/accounts.rs b/src/accounts.rs index d10c7a58c..eaa656384 100644 --- a/src/accounts.rs +++ b/src/accounts.rs @@ -18,7 +18,7 @@ use tokio::time::{Duration, sleep}; use crate::context::{Context, ContextBuilder}; use crate::events::{Event, EventEmitter, EventType, Events}; -use crate::log::{info, warn}; +use crate::log::warn; use crate::push::PushSubscriber; use crate::stock_str::StockStrings; diff --git a/src/blob.rs b/src/blob.rs index ca47c65a4..1b11cfea3 100644 --- a/src/blob.rs +++ b/src/blob.rs @@ -20,7 +20,7 @@ use crate::config::Config; use crate::constants::{self, MediaQuality}; use crate::context::Context; use crate::events::EventType; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::Viewtype; use crate::tools::sanitize_filename; diff --git a/src/calls.rs b/src/calls.rs index 88cefb8e1..2c0402fbc 100644 --- a/src/calls.rs +++ b/src/calls.rs @@ -9,7 +9,7 @@ use crate::contact::ContactId; use crate::context::Context; use crate::events::EventType; use crate::headerdef::HeaderDef; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{self, Message, MsgId, Viewtype}; use crate::mimeparser::{MimeMessage, SystemMessage}; use crate::net::dns::lookup_host_with_cache; diff --git a/src/chat.rs b/src/chat.rs index c86a4435f..74354922e 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -32,7 +32,7 @@ use crate::ephemeral::{Timer as EphemeralTimer, start_chat_ephemeral_timers}; use crate::events::EventType; use crate::key::self_fingerprint; use crate::location; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::logged_debug_assert; use crate::message::{self, Message, MessageState, MsgId, Viewtype}; use crate::mimefactory::MimeFactory; diff --git a/src/config.rs b/src/config.rs index 57a5ce415..130b0df78 100644 --- a/src/config.rs +++ b/src/config.rs @@ -16,7 +16,7 @@ use crate::blob::BlobObject; use crate::configure::EnteredLoginParam; use crate::context::Context; use crate::events::EventType; -use crate::log::{LogExt, info}; +use crate::log::LogExt; use crate::mimefactory::RECOMMENDED_FILE_SIZE; use crate::provider::{Provider, get_provider_by_id}; use crate::sync::{self, Sync::*, SyncData}; diff --git a/src/configure.rs b/src/configure.rs index 59809591a..a0a06292d 100644 --- a/src/configure.rs +++ b/src/configure.rs @@ -27,7 +27,7 @@ use crate::config::{self, Config}; use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT; use crate::context::Context; use crate::imap::Imap; -use crate::log::{LogExt, info, warn}; +use crate::log::{LogExt, warn}; use crate::login_param::EnteredCertificateChecks; pub use crate::login_param::EnteredLoginParam; use crate::message::Message; diff --git a/src/contact.rs b/src/contact.rs index d8502928b..f15790260 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -31,7 +31,7 @@ use crate::key::{ DcKey, Fingerprint, SignedPublicKey, load_self_public_key, self_fingerprint, self_fingerprint_opt, }; -use crate::log::{LogExt, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::MessageState; use crate::mimeparser::AvatarAction; use crate::param::{Param, Params}; diff --git a/src/context.rs b/src/context.rs index 1947ccedd..12eae9707 100644 --- a/src/context.rs +++ b/src/context.rs @@ -21,7 +21,7 @@ use crate::debug_logging::DebugLogging; use crate::events::{Event, EventEmitter, EventType, Events}; use crate::imap::{FolderMeaning, Imap, ServerMetadata}; use crate::key::self_fingerprint; -use crate::log::{info, warn}; +use crate::log::warn; use crate::logged_debug_assert; use crate::login_param::EnteredLoginParam; use crate::message::{self, MessageState, MsgId}; diff --git a/src/debug_logging.rs b/src/debug_logging.rs index 5947acae2..9b437e8cc 100644 --- a/src/debug_logging.rs +++ b/src/debug_logging.rs @@ -3,7 +3,6 @@ use crate::chat::ChatId; use crate::config::Config; use crate::context::Context; use crate::events::EventType; -use crate::log::{error, info}; use crate::message::{Message, MsgId, Viewtype}; use crate::param::Param; use crate::tools::time; diff --git a/src/download.rs b/src/download.rs index ec279c4a7..a2dfce775 100644 --- a/src/download.rs +++ b/src/download.rs @@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize}; use crate::config::Config; use crate::context::Context; use crate::imap::session::Session; -use crate::log::info; use crate::message::{Message, MsgId, Viewtype}; use crate::mimeparser::{MimeMessage, Part}; use crate::tools::time; diff --git a/src/ephemeral.rs b/src/ephemeral.rs index 3e27e2253..44f732a9b 100644 --- a/src/ephemeral.rs +++ b/src/ephemeral.rs @@ -80,7 +80,7 @@ use crate::contact::ContactId; use crate::context::Context; use crate::download::MIN_DELETE_SERVER_AFTER; use crate::events::EventType; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::{Message, MessageState, MsgId, Viewtype}; use crate::mimeparser::SystemMessage; use crate::stock_str; diff --git a/src/imap.rs b/src/imap.rs index 1cfddc4b9..1aeca6d20 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -32,7 +32,7 @@ use crate::contact::{Contact, ContactId, Modifier, Origin}; use crate::context::Context; use crate::events::EventType; use crate::headerdef::{HeaderDef, HeaderDefMap}; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::{self, Message, MessageState, MessengerMessage, MsgId}; use crate::mimeparser; use crate::net::proxy::ProxyConfig; diff --git a/src/imap/client.rs b/src/imap/client.rs index 81c0ce08e..1d1dc60f0 100644 --- a/src/imap/client.rs +++ b/src/imap/client.rs @@ -8,7 +8,7 @@ use tokio::io::BufWriter; use super::capabilities::Capabilities; use crate::context::Context; -use crate::log::{LoggingStream, info, warn}; +use crate::log::{LoggingStream, warn}; use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp}; use crate::net::proxy::ProxyConfig; use crate::net::session::SessionStream; diff --git a/src/imap/idle.rs b/src/imap/idle.rs index b60c431f8..44c014bde 100644 --- a/src/imap/idle.rs +++ b/src/imap/idle.rs @@ -8,7 +8,7 @@ use tokio::time::timeout; use super::Imap; use super::session::Session; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::net::TIMEOUT; use crate::tools::{self, time_elapsed}; diff --git a/src/imap/scan_folders.rs b/src/imap/scan_folders.rs index d3208c815..c170223dd 100644 --- a/src/imap/scan_folders.rs +++ b/src/imap/scan_folders.rs @@ -5,7 +5,7 @@ use anyhow::{Context as _, Result}; use super::{get_folder_meaning_by_attrs, get_folder_meaning_by_name}; use crate::config::Config; use crate::imap::{Imap, session::Session}; -use crate::log::{LogExt, info}; +use crate::log::LogExt; use crate::tools::{self, time_elapsed}; use crate::{context::Context, imap::FolderMeaning}; diff --git a/src/imap/select_folder.rs b/src/imap/select_folder.rs index 6023c8cff..6927bd736 100644 --- a/src/imap/select_folder.rs +++ b/src/imap/select_folder.rs @@ -5,7 +5,7 @@ use anyhow::Context as _; use super::session::Session as ImapSession; use super::{get_uid_next, get_uidvalidity, set_modseq, set_uid_next, set_uidvalidity}; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; type Result = std::result::Result; diff --git a/src/imex.rs b/src/imex.rs index 8bc07b93c..d27645b1f 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -20,7 +20,7 @@ use crate::context::Context; use crate::e2ee; use crate::events::EventType; use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey}; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::pgp; use crate::qr::DCBACKUP_VERSION; use crate::sql; diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs index 16f2f6dc5..ad3647e5d 100644 --- a/src/imex/transfer.rs +++ b/src/imex/transfer.rs @@ -41,7 +41,7 @@ use tokio_util::sync::CancellationToken; use crate::chat::add_device_msg; use crate::context::Context; use crate::imex::BlobDirContents; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::Message; use crate::qr::Qr; use crate::stock_str::backup_transfer_msg_body; diff --git a/src/key.rs b/src/key.rs index e8e1e152d..059528623 100644 --- a/src/key.rs +++ b/src/key.rs @@ -15,7 +15,7 @@ use tokio::runtime::Handle; use crate::context::Context; use crate::events::EventType; -use crate::log::{LogExt, info}; +use crate::log::LogExt; use crate::pgp::KeyPair; use crate::tools::{self, time_elapsed}; diff --git a/src/location.rs b/src/location.rs index 90af6d9dd..a33e0a865 100644 --- a/src/location.rs +++ b/src/location.rs @@ -22,7 +22,7 @@ use crate::constants::DC_CHAT_ID_TRASH; use crate::contact::ContactId; use crate::context::Context; use crate::events::EventType; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{Message, MsgId, Viewtype}; use crate::mimeparser::SystemMessage; use crate::tools::{duration_to_str, time}; diff --git a/src/log.rs b/src/log.rs index aa8ce66d8..299bd84bb 100644 --- a/src/log.rs +++ b/src/log.rs @@ -23,7 +23,6 @@ macro_rules! info { }}; } -pub(crate) use info; // Workaround for . #[macro_use] @@ -60,7 +59,6 @@ macro_rules! error { }}; } -pub(crate) use error; impl Context { /// Set last error string. diff --git a/src/message.rs b/src/message.rs index 702b730dc..98f17d820 100644 --- a/src/message.rs +++ b/src/message.rs @@ -24,7 +24,7 @@ use crate::ephemeral::{Timer as EphemeralTimer, start_ephemeral_timers_msgids}; use crate::events::EventType; use crate::imap::markseen_on_imap_table; use crate::location::delete_poi_location; -use crate::log::{error, info, warn}; +use crate::log::warn; use crate::mimeparser::{SystemMessage, parse_message_id}; use crate::param::{Param, Params}; use crate::pgp::split_armored_data; diff --git a/src/mimefactory.rs b/src/mimefactory.rs index 3c7a2df63..e9b76aa72 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -27,7 +27,7 @@ use crate::ephemeral::Timer as EphemeralTimer; use crate::headerdef::HeaderDef; use crate::key::{DcKey, SignedPublicKey, self_fingerprint}; use crate::location; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{Message, MsgId, Viewtype}; use crate::mimeparser::{SystemMessage, is_hidden}; use crate::param::Param; diff --git a/src/mimeparser.rs b/src/mimeparser.rs index eeb884ecb..e04f1bc98 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -26,7 +26,7 @@ use crate::dehtml::dehtml; use crate::events::EventType; use crate::headerdef::{HeaderDef, HeaderDefMap}; use crate::key::{self, DcKey, Fingerprint, SignedPublicKey, load_self_secret_keyring}; -use crate::log::{error, info, warn}; +use crate::log::warn; use crate::message::{self, Message, MsgId, Viewtype, get_vcard_summary, set_msg_failed}; use crate::param::{Param, Params}; use crate::simplify::{SimplifiedText, simplify}; diff --git a/src/net/dns.rs b/src/net/dns.rs index e30e96bb3..010ec25cc 100644 --- a/src/net/dns.rs +++ b/src/net/dns.rs @@ -50,7 +50,7 @@ use tokio::time::timeout; use super::load_connection_timestamp; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::tools::time; /// Inserts entry into DNS cache diff --git a/src/net/http.rs b/src/net/http.rs index 68dff5fc7..15ccc65af 100644 --- a/src/net/http.rs +++ b/src/net/http.rs @@ -10,7 +10,7 @@ use tokio::fs; use crate::blob::BlobObject; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::net::proxy::ProxyConfig; use crate::net::session::SessionStream; use crate::net::tls::wrap_rustls; diff --git a/src/oauth2.rs b/src/oauth2.rs index 5c0b6a00e..a29e9d007 100644 --- a/src/oauth2.rs +++ b/src/oauth2.rs @@ -7,7 +7,7 @@ use percent_encoding::{NON_ALPHANUMERIC, utf8_percent_encode}; use serde::Deserialize; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::net::http::post_form; use crate::net::read_url_blob; use crate::provider; diff --git a/src/peer_channels.rs b/src/peer_channels.rs index d12d7d7f2..31e089b8d 100644 --- a/src/peer_channels.rs +++ b/src/peer_channels.rs @@ -40,7 +40,7 @@ use crate::EventType; use crate::chat::send_msg; use crate::config::Config; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{Message, MsgId, Viewtype}; use crate::mimeparser::SystemMessage; diff --git a/src/reaction.rs b/src/reaction.rs index e691b2dde..1cc6afb66 100644 --- a/src/reaction.rs +++ b/src/reaction.rs @@ -26,7 +26,6 @@ use crate::chatlist_events; use crate::contact::ContactId; use crate::context::Context; use crate::events::EventType; -use crate::log::info; use crate::message::{Message, MsgId, rfc724_mid_exists}; use crate::param::Param; diff --git a/src/receive_imf.rs b/src/receive_imf.rs index c0f8dfc10..23ce8599d 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -28,7 +28,7 @@ use crate::imap::{GENERATED_PREFIX, markseen_on_imap_table}; use crate::key::{DcKey, Fingerprint}; use crate::key::{self_fingerprint, self_fingerprint_opt}; use crate::log::LogExt; -use crate::log::{info, warn}; +use crate::log::warn; use crate::logged_debug_assert; use crate::message::{ self, Message, MessageState, MessengerMessage, MsgId, Viewtype, rfc724_mid_exists, diff --git a/src/scheduler.rs b/src/scheduler.rs index daca1aeb1..9afc9820a 100644 --- a/src/scheduler.rs +++ b/src/scheduler.rs @@ -20,7 +20,7 @@ use crate::ephemeral::{self, delete_expired_imap_messages}; use crate::events::EventType; use crate::imap::{FolderMeaning, Imap, session::Session}; use crate::location; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::MsgId; use crate::smtp::{Smtp, send_smtp_messages}; use crate::sql; diff --git a/src/scheduler/connectivity.rs b/src/scheduler/connectivity.rs index 090cadfeb..11cb6cc4e 100644 --- a/src/scheduler/connectivity.rs +++ b/src/scheduler/connectivity.rs @@ -7,7 +7,6 @@ use humansize::{BINARY, format_size}; use crate::events::EventType; use crate::imap::{FolderMeaning, scan_folders::get_watched_folder_configs}; -use crate::log::info; use crate::quota::{QUOTA_ERROR_THRESHOLD_PERCENTAGE, QUOTA_WARN_THRESHOLD_PERCENTAGE}; use crate::stock_str; use crate::{context::Context, log::LogExt}; diff --git a/src/securejoin.rs b/src/securejoin.rs index fda449f55..ebf0ea018 100644 --- a/src/securejoin.rs +++ b/src/securejoin.rs @@ -19,7 +19,7 @@ use crate::events::EventType; use crate::headerdef::HeaderDef; use crate::key::{DcKey, Fingerprint, load_self_public_key}; use crate::log::LogExt as _; -use crate::log::{error, info, warn}; +use crate::log::warn; use crate::message::{Message, Viewtype}; use crate::mimeparser::{MimeMessage, SystemMessage}; use crate::param::Param; diff --git a/src/securejoin/bob.rs b/src/securejoin/bob.rs index 4a0d67b10..fbe4446b6 100644 --- a/src/securejoin/bob.rs +++ b/src/securejoin/bob.rs @@ -10,7 +10,6 @@ use crate::contact::Origin; use crate::context::Context; use crate::events::EventType; use crate::key::self_fingerprint; -use crate::log::info; use crate::message::{Message, Viewtype}; use crate::mimeparser::{MimeMessage, SystemMessage}; use crate::param::Param; diff --git a/src/smtp.rs b/src/smtp.rs index f19637060..5c7e8df0a 100644 --- a/src/smtp.rs +++ b/src/smtp.rs @@ -13,7 +13,7 @@ use crate::config::Config; use crate::contact::{Contact, ContactId}; use crate::context::Context; use crate::events::EventType; -use crate::log::{error, info, warn}; +use crate::log::warn; use crate::message::Message; use crate::message::{self, MsgId}; use crate::mimefactory::MimeFactory; diff --git a/src/smtp/connect.rs b/src/smtp/connect.rs index efdeaa7b6..40b76ef03 100644 --- a/src/smtp/connect.rs +++ b/src/smtp/connect.rs @@ -7,7 +7,7 @@ use async_smtp::{SmtpClient, SmtpTransport}; use tokio::io::{AsyncBufRead, AsyncWrite, BufStream}; use crate::context::Context; -use crate::log::{info, warn}; +use crate::log::warn; use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp}; use crate::net::proxy::ProxyConfig; use crate::net::session::SessionBufStream; diff --git a/src/smtp/send.rs b/src/smtp/send.rs index e030fc287..8ba1b89ef 100644 --- a/src/smtp/send.rs +++ b/src/smtp/send.rs @@ -6,7 +6,7 @@ use super::Smtp; use crate::config::Config; use crate::context::Context; use crate::events::EventType; -use crate::log::{info, warn}; +use crate::log::warn; use crate::tools; pub type Result = std::result::Result; diff --git a/src/sql.rs b/src/sql.rs index dcdb2fc64..b82edaa8a 100644 --- a/src/sql.rs +++ b/src/sql.rs @@ -16,7 +16,7 @@ use crate::debug_logging::set_debug_logging_xdc; use crate::ephemeral::start_ephemeral_timers; use crate::imex::BLOBS_BACKUP_NAME; use crate::location::delete_orphaned_poi_locations; -use crate::log::{LogExt, error, info, warn}; +use crate::log::{LogExt, warn}; use crate::message::{Message, MsgId}; use crate::net::dns::prune_dns_cache; use crate::net::http::http_cache_cleanup; diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs index 850aadca2..940ec7793 100644 --- a/src/sql/migrations.rs +++ b/src/sql/migrations.rs @@ -15,7 +15,7 @@ use crate::configure::EnteredLoginParam; use crate::constants::ShowEmails; use crate::context::Context; use crate::key::DcKey; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::MsgId; use crate::provider::get_provider_info; use crate::sql::Sql; diff --git a/src/sync.rs b/src/sync.rs index 8bcf450af..dbf7eb775 100644 --- a/src/sync.rs +++ b/src/sync.rs @@ -10,7 +10,7 @@ use crate::constants::Blocked; use crate::contact::ContactId; use crate::context::Context; use crate::log::LogExt; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{Message, MsgId, Viewtype}; use crate::mimeparser::SystemMessage; use crate::param::Param; diff --git a/src/webxdc.rs b/src/webxdc.rs index 22862afef..6b8fd838c 100644 --- a/src/webxdc.rs +++ b/src/webxdc.rs @@ -40,7 +40,7 @@ use crate::contact::ContactId; use crate::context::Context; use crate::events::EventType; use crate::key::self_fingerprint; -use crate::log::{info, warn}; +use crate::log::warn; use crate::message::{Message, MessageState, MsgId, Viewtype}; use crate::mimefactory::RECOMMENDED_FILE_SIZE; use crate::mimeparser::SystemMessage;