Skip to content

Commit 10aef46

Browse files
msrd0msrd0
authored
Rename reqwest-client feature to reqwest-client-native-tls (#140)
1 parent a9a9835 commit 10aef46

File tree

5 files changed

+36
-20
lines changed

5 files changed

+36
-20
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
### Checklist
66
- [ ] Formatted code using `cargo fmt --all`
77
- [ ] Linted code using clippy
8-
- [ ] with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,reqwest-client -- -D warnings`
8+
- [ ] with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,reqwest-client-rustls -- -D warnings`
99
- [ ] with surf feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,hyper-client -- -D warnings`
1010
- [ ] Updated README.md using `cargo doc2readme -p influxdb --expand-macros`
1111
- [ ] Reviewed the diff. Did you leave any print statements or unnecessary comments?

‎.github/workflows/rust.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
components: clippy
3030
- name: Check Clippy lints (reqwest)
31-
run: cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,reqwest-client -- -D warnings
31+
run: cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,reqwest-client-rustls -- -D warnings
3232
- name: Check Clippy lints (surf)
3333
run: cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features use-serde,derive,hyper-client -- -D warnings
3434

@@ -94,7 +94,14 @@ jobs:
9494
- name: Stable
9595
toolchain: stable
9696
nightly: false
97-
http-backend: [curl-client, h1-client, h1-client-rustls, hyper-client, reqwest-client, reqwest-client-rustls, reqwest-client-native-tls-vendored]
97+
http-backend:
98+
- curl-client
99+
- h1-client
100+
- h1-client-rustls
101+
- hyper-client
102+
- reqwest-client-rustls
103+
- reqwest-client-native-tls
104+
- reqwest-client-native-tls-vendored
98105
services:
99106
influxdb:
100107
image: influxdb:1.8

‎README.md

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,35 +119,41 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
119119

120120
- **[hyper][__link7]** (through reqwest), with native TLS (OpenSSL)
121121
```toml
122-
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "reqwest-client"] }
122+
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "reqwest-client-native-tls"] }
123123
```
124124

125125

126-
- **[hyper][__link8]** (through surf), use this if you need tokio 0.2 compatibility
126+
- **[hyper][__link8]** (through reqwest), with vendored native TLS (OpenSSL)
127+
```toml
128+
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "reqwest-client-native-tls-vendored"] }
129+
```
130+
131+
132+
- **[hyper][__link9]** (through surf), use this if you need tokio 0.2 compatibility
127133
```toml
128134
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "hyper-client"] }
129135
```
130136

131137

132-
- **[curl][__link9]**, using [libcurl][__link10]
138+
- **[curl][__link10]**, using [libcurl][__link11]
133139
```toml
134140
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "curl-client"] }
135141
```
136142

137143

138-
- **[async-h1][__link11]** with native TLS (OpenSSL)
144+
- **[async-h1][__link12]** with native TLS (OpenSSL)
139145
```toml
140146
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "h1-client"] }
141147
```
142148

143149

144-
- **[async-h1][__link12]** with [rustls][__link13]
150+
- **[async-h1][__link13]** with [rustls][__link14]
145151
```toml
146152
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "h1-client-rustls"] }
147153
```
148154

149155

150-
- WebAssembly’s `window.fetch`, via `web-sys` and **[wasm-bindgen][__link14]**
156+
- WebAssembly’s `window.fetch`, via `web-sys` and **[wasm-bindgen][__link15]**
151157
```toml
152158
influxdb = { version = "0.7.2", default-features = false, features = ["derive", "use-serde", "wasm-client"] }
153159
```
@@ -157,29 +163,30 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
157163

158164
## License
159165

160-
[![License: MIT][__link15]][__link16]
166+
[![License: MIT][__link16]][__link17]
161167

162168

163169

164170
@ 2020-2024 Gero Gerke, msrd0 and [contributors].
165171

166172
[contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors
167-
[__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG_RDmlyxxvyrG0rwcLBKoYdvG5It9hbWNgjUGzjD8iBYfsFFYXKEG_jUEtkcTe33G_OOvfcbq3PhGx42EDLMgbCFGy0-H8MaqaBGYWSBgmhpbmZsdXhkYmUwLjcuMg
173+
[__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG_RDmlyxxvyrG0rwcLBKoYdvG5It9hbWNgjUGzjD8iBYfsFFYXKEG1DulEn7euxHG8tYaxMHih9OG3Xjpd76jUgIG23kKLUzm3NrYWSBgmhpbmZsdXhkYmUwLjcuMg
168174
[__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md
169175
[__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md
170-
[__link10]: https://curl.se/libcurl/
171-
[__link11]: https://github.com/http-rs/async-h1
176+
[__link10]: https://github.com/alexcrichton/curl-rust
177+
[__link11]: https://curl.se/libcurl/
172178
[__link12]: https://github.com/http-rs/async-h1
173-
[__link13]: https://github.com/ctz/rustls
174-
[__link14]: https://github.com/rustwasm/wasm-bindgen
175-
[__link15]: https://img.shields.io/badge/License-MIT-yellow.svg
176-
[__link16]: https://opensource.org/licenses/MIT
179+
[__link13]: https://github.com/http-rs/async-h1
180+
[__link14]: https://github.com/ctz/rustls
181+
[__link15]: https://github.com/rustwasm/wasm-bindgen
182+
[__link16]: https://img.shields.io/badge/License-MIT-yellow.svg
183+
[__link17]: https://opensource.org/licenses/MIT
177184
[__link2]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CHANGELOG.md
178185
[__link3]: https://github.com/influxdb-rs/influxdb-rust/blob/main/influxdb/Cargo.toml
179186
[__link4]: https://docs.rs/influxdb/0.7.2/influxdb/?search=integrations::serde_integration
180187
[__link5]: https://github.com/hyperium/hyper
181188
[__link6]: https://github.com/ctz/rustls
182189
[__link7]: https://github.com/hyperium/hyper
183190
[__link8]: https://github.com/hyperium/hyper
184-
[__link9]: https://github.com/alexcrichton/curl-rust
191+
[__link9]: https://github.com/hyperium/hyper
185192

‎influxdb/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ curl-client = ["surf", "surf/curl-client"]
3535
h1-client = ["surf", "surf/h1-client"]
3636
h1-client-rustls = ["surf", "surf/h1-client-rustls"]
3737
hyper-client = ["surf", "surf/hyper-client"]
38-
reqwest-client = ["reqwest", "reqwest/native-tls-alpn"]
3938
reqwest-client-rustls = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
39+
reqwest-client-native-tls = ["reqwest", "reqwest/native-tls-alpn"]
4040
reqwest-client-native-tls-vendored = ["reqwest", "reqwest/native-tls-vendored"]
4141
wasm-client = ["surf", "surf/wasm-client"]
4242

‎influxdb/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +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", "use-serde", "reqwest-client")]
79+
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "use-serde", "reqwest-client-native-tls")]
80+
//! - **[hyper](https://github.com/hyperium/hyper)** (through reqwest), with vendored native TLS (OpenSSL)
81+
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "use-serde", "reqwest-client-native-tls-vendored")]
8082
//! - **[hyper](https://github.com/hyperium/hyper)** (through surf), use this if you need tokio 0.2 compatibility
8183
#![doc = cargo_toml!(indent="\t", default-features = false, "derive", "use-serde", "hyper-client")]
8284
//! - **[curl](https://github.com/alexcrichton/curl-rust)**, using [libcurl](https://curl.se/libcurl/)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy