fix: Use Method through reqwest which re-exports http anyway

apache · Oct 11, 2023 · 4dc20e6 · 4dc20e6
1 parent 15a0746
commit 4dc20e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml
@@ -45,7 +45,6 @@ walkdir = "2"
 
 # Cloud storage support
 base64 = { version = "0.21", default-features = false, features = ["std"], optional = true }
-http = { version = "0.2", default_features = false, optional = true }
 hyper = { version = "0.14", default-features = false, optional = true }
 quick-xml = { version = "0.30.0", features = ["serialize", "overlapped-lists"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
@@ -65,7 +64,7 @@ tokio = { version = "1.25.0", features = ["sync", "macros", "rt", "time", "io-ut
 nix = { version = "0.27.1", features = ["fs"] }
 
 [features]
-cloud = ["serde", "serde_json", "quick-xml", "dep:http", "hyper", "reqwest", "reqwest/json", "reqwest/stream", "chrono/serde", "base64", "rand", "ring"]
+cloud = ["serde", "serde_json", "quick-xml", "hyper", "reqwest", "reqwest/json", "reqwest/stream", "chrono/serde", "base64", "rand", "ring"]
 azure = ["cloud"]
 gcp = ["cloud", "rustls-pemfile"]
 aws = ["cloud"]

diff --git a/object_store/src/aws/mod.rs b/object_store/src/aws/mod.rs
@@ -232,7 +232,7 @@ impl Signer for AmazonS3 {
     /// ```
     /// # async fn example() -> Result<(), Box<dyn std::error::Error>> {
     /// # use object_store::{aws::AmazonS3Builder, path::Path, signer::Signer};
-    /// # use http::Method;
+    /// # use reqwest::Method;
     /// # use std::time::Duration;
     /// #
     /// let region = "us-east-1";

diff --git a/object_store/src/signer.rs b/object_store/src/signer.rs
@@ -19,7 +19,7 @@
 
 use crate::{path::Path, Result};
 use async_trait::async_trait;
-use http::Method;
+use reqwest::Method;
 use std::{fmt, time::Duration};
 use url::Url;