From 3c5f30d41e850dad7e00caadf9e2d64e9c8eb2e5 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@element.io>
Date: Wed, 13 Jul 2022 18:08:03 +0200
Subject: [PATCH] refactor: Remove implicit features for optional dependencies

Consistently use `dep:` syntax for optional dependencies so they don't
implicitly act as features of their own.
---
 bindings/matrix-sdk-crypto-nodejs/Cargo.toml  |  2 +-
 crates/matrix-sdk-base/Cargo.toml             |  6 +++---
 crates/matrix-sdk-crypto/Cargo.toml           |  6 +++---
 crates/matrix-sdk-indexeddb/Cargo.toml        |  2 +-
 crates/matrix-sdk-qrcode/Cargo.toml           |  2 +-
 crates/matrix-sdk-sled/Cargo.toml             | 12 ++++++++----
 crates/matrix-sdk-store-encryption/Cargo.toml |  2 +-
 crates/matrix-sdk/Cargo.toml                  | 10 +++++-----
 8 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/bindings/matrix-sdk-crypto-nodejs/Cargo.toml b/bindings/matrix-sdk-crypto-nodejs/Cargo.toml
index 8fc02a806..bfe122f7e 100644
--- a/bindings/matrix-sdk-crypto-nodejs/Cargo.toml
+++ b/bindings/matrix-sdk-crypto-nodejs/Cargo.toml
@@ -22,7 +22,7 @@ crate-type = ["cdylib"]
 default = []
 qrcode = ["matrix-sdk-crypto/qrcode"]
 docsrs = []
-tracing = ["tracing-subscriber"]
+tracing = ["dep:tracing-subscriber"]
 
 [dependencies]
 matrix-sdk-crypto = { version = "0.5.0", path = "../../crates/matrix-sdk-crypto" }
diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml
index ef9bd65f7..df9f29462 100644
--- a/crates/matrix-sdk-base/Cargo.toml
+++ b/crates/matrix-sdk-base/Cargo.toml
@@ -17,12 +17,12 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = []
-e2e-encryption = ["matrix-sdk-crypto"]
-qrcode = ["matrix-sdk-crypto/qrcode"]
+e2e-encryption = ["dep:matrix-sdk-crypto"]
+qrcode = ["matrix-sdk-crypto?/qrcode"]
 experimental-timeline = []
 
 # helpers for testing features build upon this
-testing = ["http"]
+testing = ["dep:http"]
 
 [dependencies]
 async-stream = "0.3.3"
diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml
index 03221c856..21672e48f 100644
--- a/crates/matrix-sdk-crypto/Cargo.toml
+++ b/crates/matrix-sdk-crypto/Cargo.toml
@@ -17,12 +17,12 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = []
-qrcode = ["matrix-sdk-qrcode"]
-backups_v1 = ["olm-rs", "bs58"]
+qrcode = ["dep:matrix-sdk-qrcode"]
+backups_v1 = ["dep:olm-rs", "dep:bs58"]
 docsrs = []
 
 # Testing helpers for implementations based upon this
-testing = ["http"]
+testing = ["dep:http"]
 
 [dependencies]
 aes = "0.8.1"
diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml
index ab70fa6af..5703b5816 100644
--- a/crates/matrix-sdk-indexeddb/Cargo.toml
+++ b/crates/matrix-sdk-indexeddb/Cargo.toml
@@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["e2e-encryption"]
-e2e-encryption = ["matrix-sdk-base/e2e-encryption", "matrix-sdk-crypto"]
+e2e-encryption = ["matrix-sdk-base/e2e-encryption", "dep:matrix-sdk-crypto"]
 experimental-timeline = ["matrix-sdk-base/experimental-timeline"]
 
 
diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml
index 8823bff77..350ebd05d 100644
--- a/crates/matrix-sdk-qrcode/Cargo.toml
+++ b/crates/matrix-sdk-qrcode/Cargo.toml
@@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = ["decode_image"]
-decode_image = ["image", "rqrr", "qrcode/image", "qrcode/svg"]
+decode_image = ["dep:image", "dep:rqrr", "qrcode/image", "qrcode/svg"]
 
 [dependencies]
 base64 = "0.13.0"
diff --git a/crates/matrix-sdk-sled/Cargo.toml b/crates/matrix-sdk-sled/Cargo.toml
index 90097c2ed..0ba6814b1 100644
--- a/crates/matrix-sdk-sled/Cargo.toml
+++ b/crates/matrix-sdk-sled/Cargo.toml
@@ -16,12 +16,16 @@ rustdoc-args = ["--cfg", "docsrs"]
 [features]
 default = ["state-store"]
 
-state-store = ["matrix-sdk-base"]
+state-store = ["dep:matrix-sdk-base"]
 crypto-store = [
-    "matrix-sdk-crypto",
-    "matrix-sdk-base/e2e-encryption",
+    "dep:matrix-sdk-base",
+    "dep:matrix-sdk-crypto",
+    "matrix-sdk-base?/e2e-encryption",
+]
+experimental-timeline = [
+    "dep:matrix-sdk-base",
+    "matrix-sdk-base?/experimental-timeline",
 ]
-experimental-timeline = ["matrix-sdk-base/experimental-timeline"]
 
 [dependencies]
 async-stream = "0.3.3"
diff --git a/crates/matrix-sdk-store-encryption/Cargo.toml b/crates/matrix-sdk-store-encryption/Cargo.toml
index 935999454..9bc333224 100644
--- a/crates/matrix-sdk-store-encryption/Cargo.toml
+++ b/crates/matrix-sdk-store-encryption/Cargo.toml
@@ -11,7 +11,7 @@ rust-version = "1.60"
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
-js = ["getrandom/js"]
+js = ["dep:getrandom", "getrandom?/js"]
 
 [dependencies]
 blake3 = "1.3.1"
diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
index b8421c629..7c2c6fe05 100644
--- a/crates/matrix-sdk/Cargo.toml
+++ b/crates/matrix-sdk/Cargo.toml
@@ -28,18 +28,18 @@ e2e-encryption = [
     "matrix-sdk-indexeddb?/e2e-encryption",   # activate on indexeddb if given
 ]
 
-sled = ["matrix-sdk-sled/state-store"]
-indexeddb = ["matrix-sdk-indexeddb"]
+sled = ["dep:matrix-sdk-sled", "matrix-sdk-sled?/state-store"]
+indexeddb = ["dep:matrix-sdk-indexeddb"]
 
 qrcode = ["e2e-encryption", "matrix-sdk-base/qrcode"]
 markdown = ["ruma/markdown"]
 native-tls = ["reqwest/native-tls"]
 rustls-tls = ["reqwest/rustls-tls"]
 socks = ["reqwest/socks"]
-sso-login = ["warp", "rand", "tokio-stream"]
+sso-login = ["warp", "dep:rand", "dep:tokio-stream"]
 appservice = ["ruma/appservice-api-s"]
-image-proc = ["image"]
-image-rayon = ["image-proc", "image/jpeg_rayon"]
+image-proc = ["dep:image"]
+image-rayon = ["image-proc", "image?/jpeg_rayon"]
 
 experimental-timeline = [
     "matrix-sdk-base/experimental-timeline",