Merge remote-tracking branch 'origin/master' into feat/async-jobs

examples/repl/cmdline.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
+use anyhow::{bail, ensure};
 use async_std::path::Path;
-
 use deltachat::chat::{self, Chat, ChatId, ChatVisibility};
 use deltachat::chatlist::*;
 use deltachat::constants::*;
@@ -92,7 +92,7 @@ async fn reset_tables(context: &Context, bits: i32) {
     });
 }
 
-async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(), Error> {
+async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(), anyhow::Error> {
     let data = dc_read_file(context, filename).await?;
 
     if let Err(err) = dc_receive_imf(context, &data, "import", 0, false).await {
@@ -292,11 +292,7 @@ fn chat_prefix(chat: &Chat) -> &'static str {
     chat.typ.into()
 }
 
-pub async fn cmdline(
-    context: Context,
-    line: &str,
-    chat_id: &mut ChatId,
-) -> Result<(), failure::Error> {
+pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Result<(), Error> {
     let mut sel_chat = if !chat_id.is_unset() {
         Chat::load_from_db(&context, *chat_id).await.ok()
     } else {

examples/repl/main.rs

@@ -7,13 +7,16 @@
 #[macro_use]
 extern crate deltachat;
 #[macro_use]
-extern crate failure;
+extern crate lazy_static;
+#[macro_use]
+extern crate rusqlite;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
 use std::io::{self, Write};
 use std::process::Command;
 
 use ansi_term::Color;
+use anyhow::{bail, Error};
 use async_std::path::Path;
 use deltachat::chat::ChatId;
 use deltachat::config;
@@ -269,10 +272,10 @@ impl Highlighter for DcHelper {
 
 impl Helper for DcHelper {}
 
-async fn start(args: Vec<String>) -> Result<(), failure::Error> {
+async fn start(args: Vec<String>) -> Result<(), Error> {
     if args.len() < 2 {
         println!("Error: Bad arguments, expected [db-name].");
-        return Err(format_err!("No db-name specified"));
+        bail!("No db-name specified");
     }
     let context = Context::new("CLI".into(), Path::new(&args[1]).to_path_buf()).await?;
 
@@ -353,7 +356,7 @@ async fn handle_cmd(
     line: &str,
     ctx: Context,
     selected_chat: &mut ChatId,
-) -> Result<ExitResult, failure::Error> {
+) -> Result<ExitResult, Error> {
     let mut args = line.splitn(2, ' ');
     let arg0 = args.next().unwrap_or_default();
     let arg1 = args.next().unwrap_or_default();
@@ -417,7 +420,7 @@ async fn handle_cmd(
     Ok(ExitResult::Continue)
 }
 
-fn main() -> Result<(), failure::Error> {
+fn main() -> Result<(), Error> {
     let _ = pretty_env_logger::try_init();
 
     let args = std::env::args().collect();