From 489f25940f1c428e5848fba123b978b388e2976a Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Tue, 3 Sep 2019 00:59:21 +0300 Subject: [PATCH] Update to the latest rust-imap It uses imap-proto 0.8.1 instead of outdated 0.7.0. --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- src/imap.rs | 12 +++++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96dc20d9c..4faf9e901 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,7 +474,7 @@ dependencies = [ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -949,12 +949,12 @@ dependencies = [ [[package]] name = "imap" version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d#31e2490d2203a837d8830736bcb183831ec4894d" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "imap-proto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -962,7 +962,7 @@ dependencies = [ [[package]] name = "imap-proto" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2855,8 +2855,8 @@ dependencies = [ "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" "checksum image-meta 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b00861cbbb254a627d8acc0cec786b484297d896ab8f20fdc8e28536a3e918ef" -"checksum imap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "178392198cb2716f4fe34b86a1bf1de1240a3e31136a199b16490fa87538fa25" -"checksum imap-proto 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4e77b1d61faf028893531b071cc5584cdd02b6186cebe7f7168ffd8d591339a" +"checksum imap 1.0.2 (git+https://github.com/jonhoo/rust-imap?rev=31e2490d2203a837d8830736bcb183831ec4894d)" = "" +"checksum imap-proto 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a588218700a1f56790d585596d5edd879dd19c2fc554b34277e1c999249d787" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" diff --git a/Cargo.toml b/Cargo.toml index c4f3b8282..6def71b4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ num-derive = "0.2.5" num-traits = "0.2.6" native-tls = "0.2.3" lettre = "0.9.0" -imap = "1.0.1" +imap = { git = "https://github.com/jonhoo/rust-imap", rev = "31e2490d2203a837d8830736bcb183831ec4894d" } mmime = { git = "https://github.com/dignifiedquire/mmime", rev = "bccd2c2" } base64 = "0.10" charset = "0.1" diff --git a/src/imap.rs b/src/imap.rs index 72a3cb4ef..23f692ffd 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -554,13 +554,11 @@ impl Imap { warn!(context, 0, "IMAP-LOGIN as {} ok but ABORTING", lp.mail_user,); (true, false, false) } else { - let can_idle = caps.has("IDLE"); - let has_xlist = caps.has("XLIST"); - let caps_list = caps.iter().fold(String::new(), |mut s, c| { - s += " "; - s += c; - s - }); + let can_idle = caps.has_str("IDLE"); + let has_xlist = caps.has_str("XLIST"); + let caps_list = caps + .iter() + .fold(String::new(), |s, c| s + &format!(" {:?}", c)); log_event!( context, Event::IMAP_CONNECTED,