Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename chrono, time and secret features #939

Merged
merged 6 commits into from
Jun 19, 2024
Merged

Rename chrono, time and secret features #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
909d617
cargo: bump `secrecy` version to 0.8
muzarski Feb 22, 2024
9e014b7
cargo: rename `secret` feature to `secrecy-08`
muzarski Feb 22, 2024
248d2db
cargo: rename `time` feature to `time-03`.
muzarski Feb 22, 2024
fabfee7
cqlvalue: make conversion to time_03 test utils
muzarski Apr 25, 2024
c737490
cargo: rename `chrono` feature to `chrono-04`
muzarski Feb 22, 2024
cc705ad
cqlvalue: make chrono conversions test utility
muzarski Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "full-serialization"
- name: Cargo check with all features
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --all-features
- name: Cargo check with secret feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secret"
- name: Cargo check with chrono feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono"
- name: Cargo check with time feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "time"
- name: Cargo check with secrecy-08 feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "secrecy-08"
- name: Cargo check with chrono-04 feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "chrono-04"
- name: Cargo check with time-03 feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "time-03"
- name: Cargo check with num-bigint-03 feature
run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features "num-bigint-03"
- name: Cargo check with num-bigint-04 feature
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock.msrv
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ rustyline-derive = "0.6"
scylla = { path = "../scylla", features = [
"ssl",
"cloud",
"chrono",
"time",
"chrono-04",
"time-03",
"num-bigint-03",
"num-bigint-04",
"bigdecimal-04",
Expand Down
20 changes: 10 additions & 10 deletions scylla-cql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,41 @@ byteorder = "1.3.4"
bytes = "1.0.1"
# FIXME: Remove <1.38 once https://github.com/tokio-rs/tokio/issues/6610 is fixed
tokio = { version = ">=1.34, <1.38", features = ["io-util", "time"] }
secrecy = { version = "0.7.0", optional = true }
secrecy-08 = { package = "secrecy", version = "0.8", optional = true }
muzarski marked this conversation as resolved.
Show resolved Hide resolved
snap = "1.0"
uuid = "1.0"
thiserror = "1.0"
num-bigint-03 = { package = "num-bigint", version = "0.3", optional = true }
num-bigint-04 = { package = "num-bigint", version = "0.4", optional = true }
bigdecimal-04 = { package = "bigdecimal", version = "0.4", optional = true }
chrono = { version = "0.4.32", default-features = false, optional = true }
chrono-04 = { package = "chrono", version = "0.4.32", default-features = false, optional = true }
lz4_flex = { version = "0.11.1" }
async-trait = "0.1.57"
serde = { version = "1.0", features = ["derive"], optional = true }
time = { version = "0.3", optional = true }
time-03 = { package = "time", version = "0.3", optional = true }

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

[[bench]]
name = "benchmark"
harness = false

[features]
secret = ["secrecy"]
time = ["dep:time"]
chrono = ["dep:chrono"]
secrecy-08 = ["dep:secrecy-08"]
time-03 = ["dep:time-03"]
chrono-04 = ["dep:chrono-04"]
num-bigint-03 = ["dep:num-bigint-03"]
num-bigint-04 = ["dep:num-bigint-04"]
bigdecimal-04 = ["dep:bigdecimal-04"]
full-serialization = [
"chrono",
"time",
"secret",
"chrono-04",
"time-03",
"secrecy-08",
"num-bigint-03",
"num-bigint-04",
"bigdecimal-04",
Expand Down
Loading
Loading