Skip to content

Commit 0f73b6a

Browse files
authored
Merge pull request #939 from muzarski/add_versions_to_feature_names
Rename `chrono`, `time` and `secret` features
2 parents ab9a80e + cc705ad commit 0f73b6a

File tree

12 files changed

+363
-363
lines changed

12 files changed

+363
-363
lines changed

.github/workflows/rust.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
4545
- name: Cargo check with all features
4646
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
47-
- name: Cargo check with secret feature
48-
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
49-
- name: Cargo check with chrono feature
50-
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono"
51-
- name: Cargo check with time feature
52-
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "time"
47+
- name: Cargo check with secrecy-08 feature
48+
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secrecy-08"
49+
- name: Cargo check with chrono-04 feature
50+
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono-04"
51+
- name: Cargo check with time-03 feature
52+
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "time-03"
5353
- name: Cargo check with num-bigint-03 feature
5454
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "num-bigint-03"
5555
- name: Cargo check with num-bigint-04 feature

Cargo.lock.msrv

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ rustyline-derive = "0.6"
1313
scylla = { path = "../scylla", features = [
1414
"ssl",
1515
"cloud",
16-
"chrono",
17-
"time",
16+
"chrono-04",
17+
"time-03",
1818
"num-bigint-03",
1919
"num-bigint-04",
2020
"bigdecimal-04",

scylla-cql/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,41 @@ byteorder = "1.3.4"
1515
bytes = "1.0.1"
1616
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
1717
tokio = { version = ">=1.34, <1.38", features = ["io-util", "time"] }
18-
secrecy = { version = "0.7.0", optional = true }
18+
secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
1919
snap = "1.0"
2020
uuid = "1.0"
2121
thiserror = "1.0"
2222
num-bigint-03 = { package = "num-bigint", version = "0.3", optional = true }
2323
num-bigint-04 = { package = "num-bigint", version = "0.4", optional = true }
2424
bigdecimal-04 = { package = "bigdecimal", version = "0.4", optional = true }
25-
chrono = { version = "0.4.32", default-features = false, optional = true }
25+
chrono-04 = { package = "chrono", version = "0.4.32", default-features = false, optional = true }
2626
lz4_flex = { version = "0.11.1" }
2727
async-trait = "0.1.57"
2828
serde = { version = "1.0", features = ["derive"], optional = true }
29-
time = { version = "0.3", optional = true }
29+
time-03 = { package = "time", version = "0.3", optional = true }
3030

3131
[dev-dependencies]
3232
assert_matches = "1.5.0"
3333
criterion = "0.4" # Note: v0.5 needs at least rust 1.70.0
3434
# Use large-dates feature to test potential edge cases
35-
time = { version = "0.3.21", features = ["large-dates"] }
35+
time-03 = { package = "time", version = "0.3.21", features = ["large-dates"] }
3636
uuid = { version = "1.0", features = ["v4"] }
3737

3838
[[bench]]
3939
name = "benchmark"
4040
harness = false
4141

4242
[features]
43-
secret = ["secrecy"]
44-
time = ["dep:time"]
45-
chrono = ["dep:chrono"]
43+
secrecy-08 = ["dep:secrecy-08"]
44+
time-03 = ["dep:time-03"]
45+
chrono-04 = ["dep:chrono-04"]
4646
num-bigint-03 = ["dep:num-bigint-03"]
4747
num-bigint-04 = ["dep:num-bigint-04"]
4848
bigdecimal-04 = ["dep:bigdecimal-04"]
4949
full-serialization = [
50-
"chrono",
51-
"time",
52-
"secret",
50+
"chrono-04",
51+
"time-03",
52+
"secrecy-08",
5353
"num-bigint-03",
5454
"num-bigint-04",
5555
"bigdecimal-04",

0 commit comments

Comments
 (0)