Skip to content

Commit 138ba38

Browse files
authored
Merge pull request #184 from influxdb-rs/reqwest-0.13
Update reqwest to 0.13 and forward features
2 parents d6ff3f2 + ca4b177 commit 138ba38

File tree

6 files changed

+29
-21
lines changed

6 files changed

+29
-21
lines changed

.github/workflows/rust.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ jobs:
1616
- uses: docker://codeberg.org/msrd0/cargo-doc2readme:nightly
1717
with:
1818
entrypoint: cargo
19-
args: doc2readme -p influxdb --expand-macros --check
19+
args: doc2readme --check
2020

2121
# this checks that there are no clippy lints
2222
clippy:
2323
name: Style Check (clippy)
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v6
27-
- uses: dtolnay/rust-toolchain@1.88.0
27+
- uses: dtolnay/rust-toolchain@1.93.0
2828
with:
2929
components: clippy
3030
- name: Update Cargo.lock
3131
run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update
32-
- name: Check Clippy lints (reqwest)
33-
run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --no-default-features --features chrono,time,serde,derive,reqwest-client-rustls -- -D warnings
32+
- name: Check Clippy lints
33+
run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --all-features -- -D warnings
3434

3535
# this checks that the code is formatted with rustfmt
3636
rustfmt:
@@ -122,9 +122,9 @@ jobs:
122122
toolchain: stable
123123
nightly: false
124124
http-backend:
125-
- reqwest-client-rustls
126-
- reqwest-client-native-tls
127-
- reqwest-client-native-tls-vendored
125+
- rustls
126+
- native-tls
127+
- native-tls-vendored
128128
services:
129129
influxdb:
130130
image: influxdb:1.8

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
[workspace.package]
66
authors = ["Gero Gerke <git@gero.dev>", "Dominic <git@msrd0.de>"]
77
edition = "2021"
8-
rust-version = "1.70"
8+
rust-version = "1.71"
99
license = "MIT"
1010
repository = "https://github.com/influxdb-rs/influxdb-rust"
1111

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<a href="https://www.rust-lang.org/en-US/">
2626
<img src="https://img.shields.io/badge/Made%20with-Rust-orange.svg" alt='Build with Rust' />
2727
</a>
28-
<a href="https://github.com/rust-lang/rust/releases/tag/1.70.0">
29-
<img src="https://img.shields.io/badge/rustc-1.70.0+-yellow.svg" alt='Minimum Rust Version: 1.70.0' />
28+
<a href="https://github.com/rust-lang/rust/releases/tag/1.71.0">
29+
<img src="https://img.shields.io/badge/rustc-1.71.0+-yellow.svg" alt='Minimum Rust Version: 1.71.0' />
3030
</a>
3131
</p>
3232

@@ -115,12 +115,12 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
115115

116116
* **[hyper][__link7]** (through reqwest), with native TLS (OpenSSL)
117117
```toml
118-
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls"] }
118+
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "native-tls"] }
119119
```
120120

121121
* **[hyper][__link8]** (through reqwest), with vendored native TLS (OpenSSL)
122122
```toml
123-
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls-vendored"] }
123+
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "native-tls-vendored"] }
124124
```
125125

126126
## License
@@ -131,7 +131,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
131131
@ 2020-2024 Gero Gerke, msrd0 and [contributors].
132132

133133
[contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors
134-
[__cargo_doc2readme_dependencies_info]: ggGkYW0CYXSEGzJ_QpW55zB1G0S-TER-rIfLG2gXv8EYBG3jG1nuXXn-kdx-YXKEG5esg8JWCUnDGygXCh47ngu0G4kPgAyV809_G2pbKPyN9jeVYWSBgmhpbmZsdXhkYmUwLjcuMg
134+
[__cargo_doc2readme_dependencies_info]: ggGkYW0CYXSEGzJ_QpW55zB1G0S-TER-rIfLG2gXv8EYBG3jG1nuXXn-kdx-YXKEGxuf7s5mIUnXG0aItuf7_gNCG97yq-v-QgOpG7Xm07crWXUNYWSBgmhpbmZsdXhkYmUwLjcuMg
135135
[__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md
136136
[__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md
137137
[__link2]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CHANGELOG.md

doc2readme.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package = "influxdb"
2+
expand-macros = true

influxdb/Cargo.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,28 @@ futures-util = "0.3.17"
2525
http = "1.3.1"
2626
influxdb_derive = { version = "0.5.1", optional = true }
2727
lazy-regex = "3.1"
28-
reqwest = { version = "0.12.23", default-features = false }
28+
reqwest = { version = "0.13", features = ["query"], default-features = false }
2929
serde = { version = "1.0.186", optional = true }
3030
serde_derive = { version = "1.0.186", optional = true }
3131
serde_json = { version = "1.0.48", optional = true }
3232
thiserror = "2.0.16"
3333
time = { version = "0.3.39", optional = true }
3434

3535
[features]
36-
default = ["serde", "reqwest-client-rustls"]
36+
default = ["http2", "rustls", "serde", "system-proxy"]
3737
derive = ["dep:influxdb_derive"]
3838
serde = ["dep:serde", "dep:serde_derive", "dep:serde_json"]
3939

40-
# http clients
41-
reqwest-client-rustls = ["reqwest/rustls-tls-webpki-roots"]
42-
reqwest-client-native-tls = ["reqwest/native-tls-alpn"]
43-
reqwest-client-native-tls-vendored = ["reqwest/native-tls-vendored"]
40+
# http client features
41+
brotli = ["reqwest/brotli"]
42+
deflate = ["reqwest/deflate"]
43+
gzip = ["reqwest/gzip"]
44+
http2 = ["reqwest/http2"]
45+
native-tls = ["reqwest/native-tls"]
46+
native-tls-vendored = ["reqwest/native-tls-vendored"]
47+
rustls = ["reqwest/rustls"]
48+
system-proxy = ["reqwest/system-proxy"]
49+
zstd = ["reqwest/zstd"]
4450

4551
# etc
4652
time = ["dep:time"]

influxdb/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
//! - **[hyper](https://github.com/hyperium/hyper)** (through reqwest, used by default), with [rustls](https://github.com/ctz/rustls)
7777
#![doc = cargo_toml!(indent="\t", "derive")]
7878
//! - **[hyper](https://github.com/hyperium/hyper)** (through reqwest), with native TLS (OpenSSL)
79-
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "serde", "reqwest-client-native-tls")]
79+
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "serde", "native-tls")]
8080
//! - **[hyper](https://github.com/hyperium/hyper)** (through reqwest), with vendored native TLS (OpenSSL)
81-
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "serde", "reqwest-client-native-tls-vendored")]
81+
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "serde", "native-tls-vendored")]
8282
//!
8383
//! # License
8484
//!

0 commit comments

Comments
 (0)