From 84976b1dc9e9ae8be2852dc1f1b5dd4a6c7eb54d Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Wed, 3 Jun 2020 17:06:24 +0300 Subject: [PATCH] Update libloading dependency to 0.6.2 --- Cargo.lock | 5 ++--- melib/Cargo.toml | 2 +- melib/src/error.rs | 7 +++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 765e9af23..2d89cd6a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -656,11 +656,10 @@ dependencies = [ [[package]] name = "libloading" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c" dependencies = [ - "cc", "winapi 0.3.8", ] diff --git a/melib/Cargo.toml b/melib/Cargo.toml index feccd5a1e..9f238fd5f 100644 --- a/melib/Cargo.toml +++ b/melib/Cargo.toml @@ -42,7 +42,7 @@ smallvec = { version = "1.1.0", features = ["serde", ] } nix = "0.17.0" rusqlite = {version = "0.20.0", optional =true } -libloading = "0.5.2" +libloading = "0.6.2" [features] default = ["unicode_algorithms", "imap_backend", "maildir_backend", "mbox_backend", "vcard", "sqlite3"] diff --git a/melib/src/error.rs b/melib/src/error.rs index 92028cddc..31c4b9d9f 100644 --- a/melib/src/error.rs +++ b/melib/src/error.rs @@ -206,6 +206,13 @@ impl From for MeliError { } } +impl From for MeliError { + #[inline] + fn from(kind: libloading::Error) -> MeliError { + MeliError::new(format!("{}", kind)).set_source(Some(Arc::new(kind))) + } +} + impl From<&str> for MeliError { #[inline] fn from(kind: &str) -> MeliError {