Skip to content

Commit e24ad72

Browse files
Merge library targets referring to the same crate (#744)
## Usage and product changes When two library targets with the same crate name and path appear among the bazel rust targets, we assume them to refer to the same crate, but with different configuration (e.g., different set of enabled features). We update the C library targets with a crate name tag to allow the sync tool to merge them correctly. ## Implementation
1 parent cc7ca62 commit e24ad72

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

c/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ rust_static_library(
4848
"@crates//:env_logger",
4949
"@crates//:log",
5050
],
51+
tags = ["crate-name=typedb_driver_clib"],
5152
)
5253

5354
rust_cbindgen(
@@ -73,6 +74,7 @@ rust_shared_library(
7374
"@crates//:env_logger",
7475
"@crates//:log",
7576
],
77+
tags = ["crate-name=typedb_driver_clib"],
7678
)
7779

7880
filegroup(

c/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ features = {}
2121

2222
[dependencies.log]
2323
features = ["kv", "kv_unstable", "std", "value-bag"]
24-
version = "0.4.22"
24+
version = "0.4.26"
2525
default-features = false
2626

2727
[dependencies.typedb-driver]
@@ -30,8 +30,8 @@ features = {}
3030
default-features = false
3131

3232
[dependencies.chrono]
33-
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-targets"]
34-
version = "0.4.39"
33+
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-link"]
34+
version = "0.4.40"
3535
default-features = false
3636

3737
[dependencies.itertools]

dependencies/typedb/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def typedb_dependencies():
2121
git_repository(
2222
name = "typedb_dependencies",
2323
remote = "https://github.com/typedb/typedb-dependencies",
24-
commit = "5c2d4dcc25493be9d35356075372229a6d2ba2a9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
24+
commit = "cf9c1707c7896d61ff97bbf60b1880852ad42353", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
2525
)
2626

2727
def typedb_protocol():

rust/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848

4949
[dev-dependencies.serde_json]
5050
features = ["alloc", "default", "indexmap", "preserve_order", "raw_value", "std"]
51-
version = "1.0.135"
51+
version = "1.0.140"
5252
default-features = false
5353

5454
[dependencies]
5555

5656
[dependencies.tokio]
5757
features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "mio", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros"]
58-
version = "1.42.0"
58+
version = "1.43.0"
5959
default-features = false
6060

6161
[dependencies.typedb-protocol]
@@ -66,7 +66,7 @@
6666

6767
[dependencies.log]
6868
features = ["kv", "kv_unstable", "std", "value-bag"]
69-
version = "0.4.22"
69+
version = "0.4.26"
7070
default-features = false
7171

7272
[dependencies.tokio-stream]
@@ -81,7 +81,7 @@
8181

8282
[dependencies.uuid]
8383
features = ["default", "fast-rng", "rng", "serde", "std", "v4"]
84-
version = "1.11.0"
84+
version = "1.15.1"
8585
default-features = false
8686

8787
[dependencies.itertools]
@@ -91,7 +91,7 @@
9191

9292
[dependencies.prost]
9393
features = ["default", "derive", "prost-derive", "std"]
94-
version = "0.13.4"
94+
version = "0.13.5"
9595
default-features = false
9696

9797
[dependencies.chrono-tz]
@@ -120,8 +120,8 @@
120120
default-features = false
121121

122122
[dependencies.chrono]
123-
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-targets"]
124-
version = "0.4.39"
123+
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-link"]
124+
version = "0.4.40"
125125
default-features = false
126126

127127
[dependencies.crossbeam]

rust/tests/behaviour/steps/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ features = {}
1616

1717
[dependencies.tokio]
1818
features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "mio", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "time", "tokio-macros"]
19-
version = "1.42.0"
19+
version = "1.43.0"
2020
default-features = false
2121

2222
[dependencies.smol]
@@ -55,13 +55,13 @@ features = {}
5555
default-features = false
5656

5757
[dependencies.chrono]
58-
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-targets"]
59-
version = "0.4.39"
58+
features = ["alloc", "android-tzdata", "clock", "default", "iana-time-zone", "js-sys", "now", "oldtime", "serde", "std", "wasm-bindgen", "wasmbind", "winapi", "windows-link"]
59+
version = "0.4.40"
6060
default-features = false
6161

6262
[dependencies.uuid]
6363
features = ["default", "fast-rng", "rng", "serde", "std", "v4"]
64-
version = "1.11.0"
64+
version = "1.15.1"
6565
default-features = false
6666

6767
[dependencies.itertools]
@@ -71,6 +71,6 @@ features = {}
7171

7272
[dependencies.serde_json]
7373
features = ["alloc", "default", "indexmap", "preserve_order", "raw_value", "std"]
74-
version = "1.0.135"
74+
version = "1.0.140"
7575
default-features = false
7676

0 commit comments

Comments
 (0)