Skip to content

Commit 82b8c37

Browse files
authored
Merge pull request #245 from weiznich/fix/244
Fix building with different feature combinations
2 parents 52dc601 + 6a413a8 commit 82b8c37

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,12 @@ jobs:
247247
# cannot test sqlite yet as that crate
248248
# as broken min-version dependencies as well
249249
run: cargo +1.84.0 minimal-versions check -p diesel-async --features "postgres bb8 deadpool mobc"
250+
all_features_build:
251+
name: Check all feature combination build
252+
runs-on: ubuntu-latest
253+
steps:
254+
- uses: actions/checkout@v4
255+
- uses: dtolnay/rust-toolchain@stable
256+
- uses: taiki-e/install-action@cargo-hack
257+
- name: Check feature combinations
258+
run: cargo hack check --feature-powerset --no-dev-deps --depth 2

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
66

77
## [Unreleased]
88

9+
## [0.6.1] - 2025-07-03
10+
11+
* Fix features for some dependencies
12+
913
## [0.6.0] - 2025-07-02
1014

1115
* Allow to control the statement cache size
@@ -96,4 +100,5 @@ in the pool should be checked if they are still valid
96100
[0.5.1]: https://github.com/weiznich/diesel_async/compare/v0.5.0...v0.5.1
97101
[0.5.2]: https://github.com/weiznich/diesel_async/compare/v0.5.1...v0.5.2
98102
[0.6.0]: https://github.com/weiznich/diesel_async/compare/v0.5.2...v0.6.0
99-
[Unreleased]: https://github.com/weiznich/diesel_async/compare/v0.5.0...main
103+
[0.6.1]: https://github.com/weiznich/diesel_async/compare/v0.6.0...v0.6.1
104+
[Unreleased]: https://github.com/weiznich/diesel_async/compare/v0.6.1...main

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "diesel-async"
3-
version = "0.6.0"
3+
version = "0.6.1"
44
authors = ["Georg Semmler <github@weiznich.de>"]
55
edition = "2021"
66
autotests = false
@@ -72,11 +72,11 @@ mysql = [
7272
postgres = ["diesel/postgres_backend", "tokio-postgres", "tokio", "tokio/rt"]
7373
sqlite = ["diesel/sqlite", "sync-connection-wrapper"]
7474
sync-connection-wrapper = ["tokio/rt"]
75-
async-connection-wrapper = ["tokio/net"]
75+
async-connection-wrapper = ["tokio/net", "tokio/rt"]
7676
pool = []
7777
r2d2 = ["pool", "diesel/r2d2"]
78-
bb8 = ["pool", "dep:bb8", "dep:async-trait"]
79-
mobc = ["pool", "dep:mobc"]
78+
bb8 = ["pool", "dep:bb8"]
79+
mobc = ["pool", "dep:mobc", "dep:async-trait", "tokio/sync"]
8080
deadpool = ["pool", "dep:deadpool"]
8181

8282
[[test]]

0 commit comments

Comments
 (0)