From 4508eced376fc4833a86d6faf3b2034fdf361378 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Wed, 27 Jan 2021 21:58:05 +0100 Subject: [PATCH] Use bail macro This seems to be our standard way to do this. --- src/contact.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/contact.rs b/src/contact.rs index d743e65d3..4c8a86202 100644 --- a/src/contact.rs +++ b/src/contact.rs @@ -1,6 +1,6 @@ //! Contacts module -use anyhow::{bail, ensure, format_err, Context as _, Error, Result}; +use anyhow::{bail, ensure, format_err, Context as _, Result}; use async_std::path::PathBuf; use deltachat_derive::{FromSql, ToSql}; use itertools::Itertools; @@ -294,7 +294,7 @@ impl Contact { min_origin: Origin, ) -> Result> { if addr.as_ref().is_empty() { - return Err(Error::msg("lookup_id_by_addr: empty address")); + bail!("lookup_id_by_addr: empty address"); } let addr_normalized = addr_normalize(addr.as_ref());