breaking: delete runtime+TLS combination features

Author: abonander

Cargo.toml

@@ -92,14 +92,6 @@ tls-rustls-ring-native-roots = ["sqlx-core/_tls-rustls-ring-native-roots", "sqlx
 # No-op feature used by the workflows to compile without TLS enabled. Not meant for general use.
 tls-none = []
 
-# Legacy Runtime + TLS features
-
-runtime-async-std-native-tls = ["runtime-async-std", "tls-native-tls"]
-runtime-async-std-rustls = ["runtime-async-std", "tls-rustls-ring"]
-
-runtime-tokio-native-tls = ["runtime-tokio", "tls-native-tls"]
-runtime-tokio-rustls = ["runtime-tokio", "tls-rustls-ring"]
-
 # for conditional compilation
 _rt-async-std = []
 _rt-tokio = []

README.md

@@ -165,16 +165,8 @@ be removed in the future.
 
 -   `runtime-async-std`: Use the `async-std` runtime without enabling a TLS backend.
 
--   `runtime-async-std-native-tls`: Use the `async-std` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
-
--   `runtime-async-std-rustls`: Use the `async-std` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
-
 -   `runtime-tokio`: Use the `tokio` runtime without enabling a TLS backend.
 
--   `runtime-tokio-native-tls`: Use the `tokio` runtime and `native-tls` TLS backend (SOFT-DEPRECATED).
-
--   `runtime-tokio-rustls`: Use the `tokio` runtime and `rustls` TLS backend (SOFT-DEPRECATED).
-
     - Actix-web is fully compatible with Tokio and so a separate runtime feature is no longer needed.
 
 -   `tls-native-tls`: Use the `native-tls` TLS backend (OpenSSL on *nix, SChannel on Windows, Secure Transport on macOS).

sqlx-cli/Cargo.toml

@@ -50,8 +50,8 @@ backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 
 [features]
 default = ["postgres", "sqlite", "mysql", "native-tls", "completions"]
-rustls = ["sqlx/runtime-tokio-rustls"]
-native-tls = ["sqlx/runtime-tokio-native-tls"]
+rustls = ["sqlx/tls-rustls"]
+native-tls = ["sqlx/tls-native-tls"]
 
 # databases
 mysql = ["sqlx/mysql"]

src/lib.md

@@ -12,8 +12,6 @@ You choose which runtime SQLx uses by default by enabling one of the following f
 * `runtime-async-std`
 * `runtime-tokio`
 
-The `runtime-actix` feature also exists but is an alias of `runtime-tokio`.
-
 If more than one runtime feature is enabled, the Tokio runtime is used if a Tokio context exists on the current
 thread, i.e. [`tokio::runtime::Handle::try_current()`] returns `Ok`; `async-std` is used otherwise.
 
@@ -53,9 +51,6 @@ Consult the user manual for your database to find the TLS versions it supports.
 If your connection configuration requires a TLS upgrade but TLS support was not enabled, the connection attempt
 will return an error.
 
-The legacy runtime+TLS combination feature flags are still supported, but for forward-compatibility, use of the separate
-runtime and TLS feature flags is recommended.
-
 [the LaunchBadge team]: https://www.launchbadge.com
 [README]: https://www.github.com/launchbadge/sqlx/tree/main/README.md
 [browse our example projects]: https://www.github.com/launchbadge/sqlx/tree/main/examples