Skip to content

Commit 9e25785

Browse files
guenhterguenhter
committed
Not enable the rustls feature by default for sqlx
DB's like sqlite not need the tls feature with sqlx at all. When cross compiling e.g. to i586, ring is not supported and therefore the db-pool cannot be used because the rustls feature is turned on by default even though not needed.
1 parent 3bf9ef0 commit 9e25785

File tree

20 files changed

+86
-42
lines changed

20 files changed

+86
-42
lines changed

‎contrib/db_pools/lib/Cargo.toml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rocket_db_pools"
3-
version = "0.1.0"
3+
version = "0.2.1"
44
authors = ["Sergio Benitez <sb@sergio.bz>", "Jeb Rosen <jeb@jebrosen.com>"]
55
description = "Rocket async database pooling support"
66
repository = "https://github.com/rwf2/Rocket/tree/master/contrib/db_pools"
@@ -26,13 +26,23 @@ sqlx_postgres = ["sqlx", "sqlx/postgres", "log"]
2626
sqlx_sqlite = ["sqlx", "sqlx/sqlite", "log"]
2727
sqlx_macros = ["sqlx/macros"]
2828
# diesel features
29-
diesel_postgres = ["diesel-async/postgres", "diesel-async/deadpool", "deadpool", "diesel"]
30-
diesel_mysql = ["diesel-async/mysql", "diesel-async/deadpool", "deadpool", "diesel"]
29+
diesel_postgres = [
30+
"diesel-async/postgres",
31+
"diesel-async/deadpool",
32+
"deadpool",
33+
"diesel",
34+
]
35+
diesel_mysql = [
36+
"diesel-async/mysql",
37+
"diesel-async/deadpool",
38+
"deadpool",
39+
"diesel",
40+
]
3141
# implicit features: mongodb
3242

3343
[dependencies.rocket]
3444
path = "../../../core/lib"
35-
version = "0.6.0-dev"
45+
version = "0.5.2-dev"
3646
default-features = false
3747

3848
[dependencies.rocket_db_pools_codegen]
@@ -77,7 +87,7 @@ optional = true
7787
[dependencies.sqlx]
7888
version = "0.8"
7989
default-features = false
80-
features = ["runtime-tokio-rustls"]
90+
features = ["runtime-tokio"]
8191
optional = true
8292

8393
[dependencies.log]

‎contrib/db_pools/lib/src/diesel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//!
99
//! ```toml
1010
//! [dependencies]
11-
//! rocket = "0.6.0-dev"
11+
//! rocket = "0.5.2-dev"
1212
//! diesel = "2"
1313
//!
1414
//! [dependencies.rocket_db_pools]

‎contrib/dyn_templates/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ optional = true
3434
features = ["loader", "speedups", "json", "urlencode"]
3535

3636
[dependencies.rocket]
37-
version = "0.6.0-dev"
37+
version = "0.5.2-dev"
3838
path = "../../core/lib"
3939
default-features = false
4040

‎contrib/sync_db_pools/lib/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ version = "0.1.0"
4141
path = "../codegen"
4242

4343
[dependencies.rocket]
44-
version = "0.6.0-dev"
44+
version = "0.5.2-dev"
4545
path = "../../../core/lib"
4646
default-features = false
4747

4848
[build-dependencies]
4949
version_check = "0.9.1"
5050

5151
[dev-dependencies.rocket]
52-
version = "0.6.0-dev"
52+
version = "0.5.2-dev"
5353
path = "../../../core/lib"
5454
default-features = false
5555
features = ["trace"]

‎contrib/ws/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tungstenite = ["tokio-tungstenite"]
2323
tokio-tungstenite = { version = "0.23", optional = true }
2424

2525
[dependencies.rocket]
26-
version = "0.6.0-dev"
26+
version = "0.5.2-dev"
2727
path = "../../core/lib"
2828
default-features = false
2929

‎core/codegen/Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rocket_codegen"
3-
version = "0.6.0-dev"
3+
version = "0.5.2-dev"
44
authors = ["Sergio Benitez <sb@sergio.bz>"]
55
description = "Procedural macros for the Rocket web framework."
66
documentation = "https://api.rocket.rs/master/rocket_codegen/"
@@ -21,17 +21,22 @@ proc-macro = true
2121
[dependencies]
2222
indexmap = "2"
2323
quote = "1.0"
24-
syn = { version = "2.0", features = ["full", "visit", "visit-mut", "extra-traits"] }
24+
syn = { version = "2.0", features = [
25+
"full",
26+
"visit",
27+
"visit-mut",
28+
"extra-traits",
29+
] }
2530
proc-macro2 = "1.0.60"
2631
devise = "0.4"
27-
rocket_http = { version = "0.6.0-dev", path = "../http/" }
32+
rocket_http = { version = "0.5.2-dev", path = "../http/" }
2833
unicode-xid = "0.2"
2934
version_check = "0.9"
3035
glob = "0.3"
3136

3237
[dev-dependencies]
3338
rocket = { path = "../lib", features = ["json", "msgpack"] }
34-
time = { version = "0.3", features = ["macros"] }
39+
time = { version = "0.3", features = ["macros"] }
3540
pretty_assertions = "1"
3641
version_check = "0.9"
3742
trybuild = "1.0"

‎core/codegen/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
//!
2222
//! ```toml
2323
//! [dependencies]
24-
//! rocket = "0.6.0-dev"
24+
//! rocket = "0.5.2-dev"
2525
//! ```
2626
//!
2727
//! And to import all macros, attributes, and derives via `#[macro_use]` in the

‎core/http/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rocket_http"
3-
version = "0.6.0-dev"
3+
version = "0.5.2-dev"
44
authors = ["Sergio Benitez <sb@sergio.bz>"]
55
description = """
66
Types, traits, and parsers for HTTP requests, responses, and headers.

‎core/lib/Cargo.toml

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rocket"
3-
version = "0.6.0-dev"
3+
version = "0.5.2-dev"
44
authors = ["Sergio Benitez <sb@sergio.bz>"]
55
description = """
66
Web framework with a focus on usability, security, extensibility, and speed.
@@ -33,33 +33,50 @@ uuid = ["uuid_", "rocket_http/uuid"]
3333
tls = ["rustls", "tokio-rustls", "rustls-pemfile"]
3434
mtls = ["tls", "x509-parser"]
3535
tokio-macros = ["tokio/macros"]
36-
trace = ["tracing-subscriber", "tinyvec", "thread_local", "rustls?/logging", "tokio-rustls?/logging", "multer/log", "s2n-quic-h3?/tracing"]
36+
trace = [
37+
"tracing-subscriber",
38+
"tinyvec",
39+
"thread_local",
40+
"rustls?/logging",
41+
"tokio-rustls?/logging",
42+
"multer/log",
43+
"s2n-quic-h3?/tracing",
44+
]
3745

3846
[dependencies]
3947
# Optional serialization dependencies.
4048
serde_json = { version = "1.0.26", optional = true }
4149
rmp-serde = { version = "1", optional = true }
42-
uuid_ = { package = "uuid", version = "1", optional = true, features = ["serde"] }
50+
uuid_ = { package = "uuid", version = "1", optional = true, features = [
51+
"serde",
52+
] }
4353

4454
# Optional MTLS dependencies
4555
x509-parser = { version = "0.16", optional = true }
4656

4757
# Hyper dependencies
4858
http = "1"
4959
bytes = "1.4"
50-
hyper = { version = "1.1", default-features = false, features = ["http1", "server"] }
51-
hyper-util = { version = "0.1.3", default-features = false, features = ["http1", "server", "tokio"] }
60+
hyper = { version = "1.1", default-features = false, features = [
61+
"http1",
62+
"server",
63+
] }
64+
hyper-util = { version = "0.1.3", default-features = false, features = [
65+
"http1",
66+
"server",
67+
"tokio",
68+
] }
5269

5370
# Non-optional, core dependencies from here on out.
5471
yansi = { version = "1.0.1", features = ["detect-tty"] }
5572
num_cpus = "1.0"
5673
time = { version = "0.3", features = ["macros", "parsing"] }
57-
memchr = "2" # TODO: Use pear instead.
74+
memchr = "2" # TODO: Use pear instead.
5875
binascii = "0.1"
5976
ref-cast = "1.0"
6077
ref-swap = "0.1.2"
6178
parking_lot = "0.12"
62-
ubyte = {version = "0.10.2", features = ["serde"] }
79+
ubyte = { version = "0.10.2", features = ["serde"] }
6380
serde = { version = "1.0", features = ["derive"] }
6481
figment = { version = "0.10.17", features = ["toml", "env"] }
6582
rand = "0.8"
@@ -76,7 +93,10 @@ futures = { version = "0.3.30", default-features = false, features = ["std"] }
7693
state = "0.6"
7794

7895
# tracing
79-
tracing = { version = "0.1.40", default-features = false, features = ["std", "attributes"] }
96+
tracing = { version = "0.1.40", default-features = false, features = [
97+
"std",
98+
"attributes",
99+
] }
80100
tinyvec = { version = "1.6", optional = true, features = ["std", "rustc_1_57"] }
81101
thread_local = { version = "1.1", optional = true }
82102

@@ -87,17 +107,26 @@ default-features = false
87107
features = ["fmt", "tracing-log", "parking_lot"]
88108

89109
[dependencies.rocket_codegen]
90-
version = "0.6.0-dev"
110+
version = "0.5.2-dev"
91111
path = "../codegen"
92112

93113
[dependencies.rocket_http]
94-
version = "0.6.0-dev"
114+
version = "0.5.2-dev"
95115
path = "../http"
96116
features = ["serde"]
97117

98118
[dependencies.tokio]
99119
version = "1.35.1"
100-
features = ["rt-multi-thread", "net", "io-util", "fs", "time", "sync", "signal", "parking_lot"]
120+
features = [
121+
"rt-multi-thread",
122+
"net",
123+
"io-util",
124+
"fs",
125+
"time",
126+
"sync",
127+
"signal",
128+
"parking_lot",
129+
]
101130

102131
[dependencies.tokio-util]
103132
version = "0.7"

‎core/lib/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
//!
2727
//! ```toml
2828
//! [dependencies]
29-
//! rocket = "0.6.0-dev"
29+
//! rocket = "0.5.2-dev"
3030
//! ```
3131
//!
3232
//! <small>Note that development versions, tagged with `-dev`, are not published
@@ -73,14 +73,14 @@
7373
//!
7474
//! ```toml
7575
//! [dependencies]
76-
//! rocket = { version = "0.6.0-dev", features = ["secrets", "tls", "json"] }
76+
//! rocket = { version = "0.5.2-dev", features = ["secrets", "tls", "json"] }
7777
//! ```
7878
//!
7979
//! Conversely, HTTP/2 can be disabled:
8080
//!
8181
//! ```toml
8282
//! [dependencies]
83-
//! rocket = { version = "0.6.0-dev", default-features = false }
83+
//! rocket = { version = "0.5.2-dev", default-features = false }
8484
//! ```
8585
//!
8686
//! [subscriber]: crate::trace::subscriber

‎core/lib/src/listener/quic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! ```toml
77
//! // Add the following to your Cargo.toml:
88
//! [dependencies]
9-
//! rocket = { version = "0.6.0-dev", features = ["http3-preview"] }
9+
//! rocket = { version = "0.5.2-dev", features = ["http3-preview"] }
1010
//!
1111
//! // In your Rocket.toml or other equivalent config source:
1212
//! [default.tls]

‎core/lib/src/serde/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! ```toml
1111
//! [dependencies.rocket]
12-
//! version = "0.6.0-dev"
12+
//! version = "0.5.2-dev"
1313
//! features = ["json"]
1414
//! ```
1515
//!

‎core/lib/src/serde/msgpack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! ```toml
1111
//! [dependencies.rocket]
12-
//! version = "0.6.0-dev"
12+
//! version = "0.5.2-dev"
1313
//! features = ["msgpack"]
1414
//! ```
1515
//!

‎core/lib/src/serde/uuid.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//!
88
//! ```toml
99
//! [dependencies.rocket]
10-
//! version = "0.6.0-dev"
10+
//! version = "0.5.2-dev"
1111
//! features = ["uuid"]
1212
//! ```
1313
//!

‎docs/guide/03-getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Now, add Rocket as a dependency in your `Cargo.toml`:
4747

4848
```toml
4949
[dependencies]
50-
rocket = "0.6.0-dev"
50+
rocket = "0.5.2-dev"
5151
```
5252

5353
! warning: Development versions must be _git_ dependencies.

‎docs/guide/05-requests.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ feature:
660660

661661
```toml
662662
## in Cargo.toml
663-
rocket = { version = "0.6.0-dev", features = ["secrets"] }
663+
rocket = { version = "0.5.2-dev", features = ["secrets"] }
664664
```
665665

666666
The API for retrieving, adding, and removing private cookies is identical except
@@ -839,7 +839,7 @@ complete example.
839839
feature can be enabled in the `Cargo.toml`:
840840

841841
```toml
842-
rocket = { version = "0.6.0-dev", features = ["json"] }
842+
rocket = { version = "0.5.2-dev", features = ["json"] }
843843
```
844844

845845
### Temporary Files

‎docs/guide/10-configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Security). To enable TLS support:
247247

248248
```toml,ignore
249249
[dependencies]
250-
rocket = { version = "0.6.0-dev", features = ["tls"] }
250+
rocket = { version = "0.5.2-dev", features = ["tls"] }
251251
```
252252

253253
2. Configure a TLS certificate chain and private key via the `tls.key` and
@@ -312,7 +312,7 @@ enabled and support configured via the `tls.mutual` config parameter:
312312

313313
```toml,ignore
314314
[dependencies]
315-
rocket = { version = "0.6.0-dev", features = ["mtls"] }
315+
rocket = { version = "0.5.2-dev", features = ["mtls"] }
316316
```
317317

318318
This implicitly enables the `tls` feature.

‎docs/guide/12-pastebin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Then add the usual Rocket dependencies to the `Cargo.toml` file:
5656

5757
```toml
5858
[dependencies]
59-
rocket = "0.6.0-dev"
59+
rocket = "0.5.2-dev"
6060
```
6161

6262
And finally, create a skeleton Rocket application to work off of in

‎docs/guide/14-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ is to depend on a `contrib` library from git while also depending on a
585585
`crates.io` version of Rocket or vice-versa:
586586

587587
```toml
588-
rocket = "0.6.0-dev"
588+
rocket = "0.5.2-dev"
589589
rocket_db_pools = { git = "https://github.com/rwf2/Rocket.git" }
590590
```
591591

‎docs/tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rocket_docs_tests"
3-
version = "0.6.0-dev"
3+
version = "0.5.2-dev"
44
workspace = "../../"
55
edition = "2021"
66
publish = false

0 commit comments

Comments
 (0)