Replace future (deprecated & archived) with anyhow

Author: swallez

Cargo.lock

@@ -40,8 +40,6 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_with = "3"
 
-
-#tokio = { version = "1", default-features = false, features = ["macros", "net", "time", "rt-multi-thread"] }
 void = "1"
 flate2 = "1"
 
@@ -51,16 +49,13 @@ default-features = false
 features = ["macros", "net", "time", "rt-multi-thread"]
 
 [dev-dependencies]
+anyhow = "1"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4", features = ["env"] }
-failure = "0.1"
-futures = "0.3"
 http = "1"
 axum = "0.8"
-#hyper = { version = "1", features = ["server", "http1"] }
 os_type = "2"
 regex = "1"
-#sysinfo = "0.31"
 textwrap = "0.16"
 xml-rs = "0.8"
 

elasticsearch/Cargo.toml

@@ -200,7 +200,7 @@ mod tests {
     use serde_json::json;
 
     #[test]
-    fn serialize_into_jsonbody_writes_to_bytes() -> Result<(), failure::Error> {
+    fn serialize_into_jsonbody_writes_to_bytes() -> anyhow::Result<()> {
         let mut bytes = BytesMut::new();
         let body: JsonBody<_> = json!({"foo":"bar","baz":1}).into();
         body.write(&mut bytes)?;
@@ -211,7 +211,7 @@ mod tests {
     }
 
     #[test]
-    fn bodies_into_ndbody_writes_to_bytes() -> Result<(), failure::Error> {
+    fn bodies_into_ndbody_writes_to_bytes() -> anyhow::Result<()> {
         let mut bytes = BytesMut::new();
         let mut bodies: Vec<JsonBody<_>> = Vec::with_capacity(2);
         bodies.push(json!({"item":1}).into());
@@ -225,7 +225,7 @@ mod tests {
     }
 
     #[test]
-    fn boxed_bodies_into_ndbody_writes_to_bytes() -> Result<(), failure::Error> {
+    fn boxed_bodies_into_ndbody_writes_to_bytes() -> anyhow::Result<()> {
         let mut bytes = BytesMut::new();
         let mut bodies: Vec<Box<dyn Body>> = Vec::with_capacity(2);
         bodies.push(Box::new(JsonBody::from(json!({"item":1}))));
@@ -239,7 +239,7 @@ mod tests {
     }
 
     #[test]
-    fn bytes_body_writes_to_bytes_mut() -> Result<(), failure::Error> {
+    fn bytes_body_writes_to_bytes_mut() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let bytes = bytes::Bytes::from(&b"{\"foo\":\"bar\",\"baz\":1}"[..]);
         bytes.write(&mut bytes_mut)?;
@@ -249,7 +249,7 @@ mod tests {
     }
 
     #[test]
-    fn bytes_body_returns_usable_buf() -> Result<(), failure::Error> {
+    fn bytes_body_returns_usable_buf() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let buf = bytes::Bytes::from(&b"{\"foo\":\"bar\",\"baz\":1}"[..]);
 
@@ -262,7 +262,7 @@ mod tests {
     }
 
     #[test]
-    fn vec_body_writes_to_bytes_mut() -> Result<(), failure::Error> {
+    fn vec_body_writes_to_bytes_mut() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let bytes = b"{\"foo\":\"bar\",\"baz\":1}".to_vec();
         bytes.write(&mut bytes_mut)?;
@@ -272,7 +272,7 @@ mod tests {
     }
 
     #[test]
-    fn bytes_slice_body_writes_to_bytes_mut() -> Result<(), failure::Error> {
+    fn bytes_slice_body_writes_to_bytes_mut() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let bytes: &'static [u8] = b"{\"foo\":\"bar\",\"baz\":1}";
         bytes.write(&mut bytes_mut)?;
@@ -282,7 +282,7 @@ mod tests {
     }
 
     #[test]
-    fn string_body_writes_to_bytes_mut() -> Result<(), failure::Error> {
+    fn string_body_writes_to_bytes_mut() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let s = String::from("{\"foo\":\"bar\",\"baz\":1}");
         s.write(&mut bytes_mut)?;
@@ -292,7 +292,7 @@ mod tests {
     }
 
     #[test]
-    fn string_slice_body_writes_to_bytes_mut() -> Result<(), failure::Error> {
+    fn string_slice_body_writes_to_bytes_mut() -> anyhow::Result<()> {
         let mut bytes_mut = BytesMut::with_capacity(21);
         let s: &'static str = "{\"foo\":\"bar\",\"baz\":1}";
         s.write(&mut bytes_mut)?;

elasticsearch/src/http/request.rs

@@ -371,7 +371,7 @@ pub mod tests {
     use serde_json::json;
 
     #[test]
-    fn deserialize_error_string() -> Result<(), failure::Error> {
+    fn deserialize_error_string() -> anyhow::Result<()> {
         let json = r#"{"error":"no handler found for uri [/test_1/test/1/_update?_source=foo%2Cbar] and method [POST]"}"#;
         let ex: Exception = serde_json::from_str(json)?;
 
@@ -383,7 +383,7 @@ pub mod tests {
     }
 
     #[test]
-    fn deserialize_illegal_argument_exception() -> Result<(), failure::Error> {
+    fn deserialize_illegal_argument_exception() -> anyhow::Result<()> {
         let json = r#"{
           "error": {
             "root_cause": [{
@@ -477,7 +477,7 @@ pub mod tests {
     }
 
     #[test]
-    fn deserialize_index_not_found_exception() -> Result<(), failure::Error> {
+    fn deserialize_index_not_found_exception() -> anyhow::Result<()> {
         let json = r#"{
           "error": {
             "root_cause": [{

elasticsearch/src/http/response.rs

@@ -686,7 +686,7 @@ mod tests {
     }
 
     #[test]
-    fn serialize_bulk_operations_with_same_type_writes_to_bytes() -> Result<(), failure::Error> {
+    fn serialize_bulk_operations_with_same_type_writes_to_bytes() -> anyhow::Result<()> {
         let mut bytes = BytesMut::new();
         let mut ops: Vec<BulkOperation<Value>> = Vec::with_capacity(4);
 
@@ -760,8 +760,7 @@ mod tests {
     }
 
     #[test]
-    fn serialize_bulk_operations_with_different_types_writes_to_bytes() -> Result<(), failure::Error>
-    {
+    fn serialize_bulk_operations_with_different_types_writes_to_bytes() -> anyhow::Result<()> {
         #[derive(Serialize)]
         struct IndexDoc<'a> {
             foo: &'a str,

elasticsearch/src/root/bulk.rs

@@ -25,7 +25,7 @@ use base64::{engine::general_purpose::STANDARD as BASE64_STANDARD, write::Encode
 use std::io::Write;
 
 #[tokio::test]
-async fn basic_auth_header() -> Result<(), failure::Error> {
+async fn basic_auth_header() -> anyhow::Result<()> {
     let server = server::http(move |req| async move {
         let mut header_value = b"Basic ".to_vec();
         {
@@ -50,7 +50,7 @@ async fn basic_auth_header() -> Result<(), failure::Error> {
 }
 
 #[tokio::test]
-async fn api_key_header() -> Result<(), failure::Error> {
+async fn api_key_header() -> anyhow::Result<()> {
     let server = server::http(move |req| async move {
         let mut header_value = b"ApiKey ".to_vec();
         {
@@ -75,7 +75,7 @@ async fn api_key_header() -> Result<(), failure::Error> {
 }
 
 #[tokio::test]
-async fn encoded_api_key_header() -> Result<(), failure::Error> {
+async fn encoded_api_key_header() -> anyhow::Result<()> {
     let server = server::http(move |req| async move {
         let mut header_value = b"ApiKey ".to_vec();
         {
@@ -101,7 +101,7 @@ async fn encoded_api_key_header() -> Result<(), failure::Error> {
 }
 
 #[tokio::test]
-async fn bearer_header() -> Result<(), failure::Error> {
+async fn bearer_header() -> anyhow::Result<()> {
     let server = server::http(move |req| async move {
         assert_eq!(req.headers()["authorization"], "Bearer access_token");
         http::Response::default()
@@ -118,7 +118,7 @@ async fn bearer_header() -> Result<(), failure::Error> {
 
 // TODO: test PKI authentication. Could configure a HttpsConnector, maybe using https://github.com/sfackler/hyper-openssl?, or send to PKI configured Elasticsearch.
 //#[tokio::test]
-//async fn client_certificate() -> Result<(), failure::Error> {
+//async fn client_certificate() -> anyhow::Result<()> {
 //    let server = server::http(move |req| {
 //        async move {
 //            http::Response::default()