Skip to content

Commit 4700c5f

Browse files
committed
breaking: delete runtime+TLS combination features
1 parent 7a248d2 commit 4700c5f

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@ tls-rustls-ring-native-roots = ["sqlx-core/_tls-rustls-ring-native-roots", "sqlx
9292
# No-op feature used by the workflows to compile without TLS enabled. Not meant for general use.
9393
tls-none = []
9494

95-
# Legacy Runtime + TLS features
96-
97-
runtime-async-std-native-tls = ["runtime-async-std", "tls-native-tls"]
98-
runtime-async-std-rustls = ["runtime-async-std", "tls-rustls-ring"]
99-
100-
runtime-tokio-native-tls = ["runtime-tokio", "tls-native-tls"]
101-
runtime-tokio-rustls = ["runtime-tokio", "tls-rustls-ring"]
102-
10395
# for conditional compilation
10496
_rt-async-std = []
10597
_rt-tokio = []

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,8 @@ be removed in the future.
165165

166166
- `runtime-async-std`: Use the `async-std` runtime without enabling a TLS backend.
167167

168-
- `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
169-
170-
- `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
171-
172168
- `runtime-tokio`: Use the `tokio` runtime without enabling a TLS backend.
173169

174-
- `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
175-
176-
- `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
177-
178170
- Actix-web is fully compatible with Tokio and so a separate runtime feature is no longer needed.
179171

180172
- `tls-native-tls`: Use the `native-tls` TLS backend (OpenSSL on *nix, SChannel on Windows, Secure Transport on macOS).

0 commit comments

Comments
 (0)