Skip to content

Commit 0915500

Browse files
committed
refactor: replace own Extensions by http version
1 parent 90d9786 commit 0915500

File tree

3 files changed

+3
-247
lines changed

3 files changed

+3
-247
lines changed

object_store/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ async-trait = "0.1.53"
3434
bytes = "1.0"
3535
chrono = { version = "0.4.34", default-features = false, features = ["clock"] }
3636
futures = "0.3"
37+
http = "1.2.0"
3738
humantime = "2.1"
3839
itertools = "0.14.0"
3940
parking_lot = { version = "0.12" }
@@ -46,7 +47,6 @@ walkdir = { version = "2", optional = true }
4647
# Cloud storage support
4748
base64 = { version = "0.22", default-features = false, features = ["std"], optional = true }
4849
form_urlencoded = { version = "1.2", optional = true }
49-
http = { version = "1.2.0", optional = true }
5050
http-body-util = { version = "0.1", optional = true }
5151
httparse = { version = "1.8.0", default-features = false, features = ["std"], optional = true }
5252
hyper = { version = "1.2", default-features = false, optional = true }
@@ -66,7 +66,7 @@ nix = { version = "0.29.0", features = ["fs"] }
6666

6767
[features]
6868
default = ["fs"]
69-
cloud = ["serde", "serde_json", "quick-xml", "hyper", "reqwest", "reqwest/stream", "chrono/serde", "base64", "rand", "ring", "dep:http", "http-body-util", "form_urlencoded", "serde_urlencoded"]
69+
cloud = ["serde", "serde_json", "quick-xml", "hyper", "reqwest", "reqwest/stream", "chrono/serde", "base64", "rand", "ring", "http-body-util", "form_urlencoded", "serde_urlencoded"]
7070
azure = ["cloud", "httparse"]
7171
fs = ["walkdir"]
7272
gcp = ["cloud", "rustls-pemfile"]

object_store/src/extensions.rs

Lines changed: 0 additions & 243 deletions
This file was deleted.

object_store/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ pub mod buffered;
511511
#[cfg(not(target_arch = "wasm32"))]
512512
pub mod chunked;
513513
pub mod delimited;
514-
pub mod extensions;
515514
#[cfg(feature = "gcp")]
516515
pub mod gcp;
517516
#[cfg(feature = "http")]
@@ -972,7 +971,7 @@ pub struct GetOptions {
972971
/// that need to pass context-specific information (like tracing spans) via trait methods.
973972
///
974973
/// These extensions are ignored entirely by backends offered through this crate.
975-
pub extensions: extensions::Extensions,
974+
pub extensions: ::http::Extensions,
976975
}
977976

978977
impl GetOptions {

0 commit comments

Comments
 (0)