Skip to content

Commit 5e21492

Browse files
ephemeralriggsCQ Bot
authored andcommitted
[rust-3p] Update lock_api to 0.4.14
Change-Id: I6a508c154d9b17bd46cbb2046e6a25258bdc823f Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1444269 Commit-Queue: Thomas Zander <thomasalpinus@google.com> Reviewed-by: David Koloski <dkoloski@google.com>
1 parent 7041583 commit 5e21492

File tree

23 files changed

+529
-211
lines changed

23 files changed

+529
-211
lines changed

third_party/rust_crates/BUILD.gn

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ group("linked-hash-map") {
530530
}
531531

532532
group("lock_api") {
533-
public_deps = [ ":lock_api-v0_4_13" ]
533+
public_deps = [ ":lock_api-v0_4_14" ]
534534
}
535535

536536
group("log") {
@@ -9673,18 +9673,18 @@ rustc_library("linked-hash-map-v0_5_6") {
96739673
applicable_licenses = [ ":linked-hash-map-v0_5_6.license" ]
96749674
}
96759675

9676-
license("lock_api-v0_4_13.license") {
9676+
license("lock_api-v0_4_14.license") {
96779677
public_package_name = "lock_api"
96789678
license_files = [
9679-
"//third_party/rust_crates/vendor/lock_api-0.4.13/LICENSE-APACHE",
9680-
"//third_party/rust_crates/vendor/lock_api-0.4.13/LICENSE-MIT",
9679+
"//third_party/rust_crates/vendor/lock_api-0.4.14/LICENSE-APACHE",
9680+
"//third_party/rust_crates/vendor/lock_api-0.4.14/LICENSE-MIT",
96819681
]
96829682
}
96839683

9684-
rustc_library("lock_api-v0_4_13") {
9684+
rustc_library("lock_api-v0_4_14") {
96859685
crate_name = "lock_api"
9686-
source_root = "//third_party/rust_crates/vendor/lock_api-0.4.13/src/lib.rs"
9687-
output_name = "lock_api-6d6355a48fca513a"
9686+
source_root = "//third_party/rust_crates/vendor/lock_api-0.4.14/src/lib.rs"
9687+
output_name = "lock_api-1b0eca378422fc00"
96889688
edition = "2021"
96899689
disable_clippy = true
96909690
enforce_source_listing = false
@@ -9698,17 +9698,16 @@ rustc_library("lock_api-v0_4_13") {
96989698

96999699
rustflags = [
97009700
"--cap-lints=allow",
9701-
"-Cmetadata=6d6355a48fca513a",
9702-
"-Cextra-filename=-6d6355a48fca513a",
9701+
"-Cmetadata=1b0eca378422fc00",
9702+
"-Cextra-filename=-1b0eca378422fc00",
97039703
"--cfg=feature=\"atomic_usize\"",
97049704
"--cfg=feature=\"default\"",
97059705
"--cfg=feature=\"serde\"",
9706-
"--cfg=has_const_fn_trait_bound",
97079706
]
97089707

97099708
visibility = [ ":*" ]
97109709

9711-
applicable_licenses = [ ":lock_api-v0_4_13.license" ]
9710+
applicable_licenses = [ ":lock_api-v0_4_14.license" ]
97129711
}
97139712

97149713
license("log-v0_4_27.license") {
@@ -11859,7 +11858,7 @@ rustc_library("parking_lot-v0_11_1") {
1185911858

1186011859
deps = []
1186111860
deps += [ ":instant-v0_1_13" ]
11862-
deps += [ ":lock_api-v0_4_13" ]
11861+
deps += [ ":lock_api-v0_4_14" ]
1186311862
deps += [ ":parking_lot_core-v0_8_3" ]
1186411863

1186511864
rustenv = []
@@ -11894,7 +11893,7 @@ rustc_library("parking_lot-v0_12_4") {
1189411893
configs -= [ "//build/config/rust:2018_idioms" ]
1189511894

1189611895
deps = []
11897-
deps += [ ":lock_api-v0_4_13" ]
11896+
deps += [ ":lock_api-v0_4_14" ]
1189811897
deps += [ ":parking_lot_core-v0_9_12" ]
1189911898

1190011899
rustenv = []
@@ -19257,7 +19256,7 @@ rustc_library("tracing-mutex-v0_3_2") {
1925719256
configs -= [ "//build/config/rust:2018_idioms" ]
1925819257

1925919258
deps = []
19260-
deps += [ ":lock_api-v0_4_13" ]
19259+
deps += [ ":lock_api-v0_4_14" ]
1926119260
deps += [ ":parking_lot-v0_12_4" ]
1926219261

1926319262
rustenv = []

third_party/rust_crates/Cargo.lock

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

third_party/rust_crates/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ json5format = "0.2.6"
153153
libc = { version = "0.2.174", features = ["extra_traits"] }
154154
libm = "0.2.15"
155155
linked-hash-map = "0.5.6"
156-
lock_api = { version = "0.4.13", features = ["serde"] }
156+
lock_api = { version = "0.4.14", features = ["serde"] }
157157
log = { version = "0.4.27", features = ["kv", "std"] }
158158
lru-cache = "0.1.2"
159159
macro_rules_attribute = "0.2.2"
@@ -694,9 +694,6 @@ rustflags = ["--cfg=freebsd11"]
694694
# It is a fork:
695695
uses_fuchsia_license = true
696696

697-
[gn.package.lock_api."0.4.13"]
698-
rustflags = ["--cfg=has_const_fn_trait_bound"]
699-
700697
# Loom has not gone through a thorough safety review yet, and needs to be
701698
# re-reviewed before it can be used outside of tests.
702699
[gn.package.loom."0.7.2"]

third_party/rust_crates/forks/tracing-mutex-0.3.2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ rust_library(
8484
version = "0.3.2",
8585
deps = [
8686
"//third_party/rust_crates/forks/tracing-mutex-0.3.2:build_script_build",
87-
"//third_party/rust_crates/vendor/lock_api-0.4.13:lock_api",
87+
"//third_party/rust_crates/vendor/lock_api-0.4.14:lock_api",
8888
"//third_party/rust_crates/vendor/parking_lot-0.12.4:parking_lot",
8989
],
9090
)

third_party/rust_crates/vendor/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,14 +1351,14 @@ alias(
13511351
)
13521352

13531353
alias(
1354-
name = "lock_api-0.4.13",
1355-
actual = "//third_party/rust_crates/vendor/lock_api-0.4.13:lock_api",
1354+
name = "lock_api-0.4.14",
1355+
actual = "//third_party/rust_crates/vendor/lock_api-0.4.14:lock_api",
13561356
tags = ["manual"],
13571357
)
13581358

13591359
alias(
13601360
name = "lock_api",
1361-
actual = "//third_party/rust_crates/vendor/lock_api-0.4.13:lock_api",
1361+
actual = "//third_party/rust_crates/vendor/lock_api-0.4.14:lock_api",
13621362
tags = ["manual"],
13631363
)
13641364

third_party/rust_crates/vendor/defs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ _NORMAL_DEPENDENCIES = {
397397
"libc": Label("//third_party/rust_crates/vendor/libc-0.2.174:libc"),
398398
"libm": Label("//third_party/rust_crates/vendor/libm-0.2.15:libm"),
399399
"linked-hash-map": Label("//third_party/rust_crates/vendor/linked-hash-map-0.5.6:linked_hash_map"),
400-
"lock_api": Label("//third_party/rust_crates/vendor/lock_api-0.4.13:lock_api"),
400+
"lock_api": Label("//third_party/rust_crates/vendor/lock_api-0.4.14:lock_api"),
401401
"log": Label("//third_party/rust_crates/vendor/log-0.4.27:log"),
402402
"lru-cache": Label("//third_party/rust_crates/vendor/lru-cache-0.1.2:lru_cache"),
403403
"macro_rules_attribute": Label("//third_party/rust_crates/vendor/macro_rules_attribute-0.2.2:macro_rules_attribute"),

third_party/rust_crates/vendor/lock_api-0.4.13/.cargo-checksum.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

third_party/rust_crates/vendor/lock_api-0.4.13/.cargo_vcs_info.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

third_party/rust_crates/vendor/lock_api-0.4.13/build.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":{".cargo_vcs_info.json":"d75d7acedc185dd8715e9fdcfb7d4dd7ad32c92eb8927db7736552c0aaecd872","Cargo.lock":"e549316c3cb9445dda6fb3b32b6d63eff2e2609192f6d9495268f01887240fa7","Cargo.toml":"dd67edbeff9cee46c3ea6411098aeec7363cb4fe865006c8eca321d321332484","Cargo.toml.orig":"713f2678ae25ea2f8f490dca9740af863f8e277fdfc76c6220a497bfa1e99bbc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"f6dfe0a321e47b5ea9f01a59711e5d3a0442949a829eb4957fa1491fbce63e5c","src/mutex.rs":"1487130ba159c9158623d58204b52531c0feaabcdea8e58c0740a29d4f33e5af","src/remutex.rs":"a0cc36a3ac9ba2a399f83667ca53670afbec0d0bae6e9c103323918594873eeb","src/rwlock.rs":"3094177475cf67c8dc34e68b3fdff2d4133ffb453860b72037477734cb87aefc"},"package":"224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"}

0 commit comments

Comments
 (0)