Skip to content

Commit 9faf17d

Browse files
jamesrCQ Bot
jamesr
authored and
CQ Bot
committed
[rust][libc] Fork libc crate to cherry-pick sockaddr_vm definition
This is being added upstream via rust-lang/libc#4194. This forks the crate so we can add a local definition to unblock our roll of various Android libraries. Change-Id: I5464ee550dfd32897a3f9a244c16ab285f84aade Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1172178 Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com> Reviewed-by: Novin Changizi <novinc@google.com> Reviewed-by: Julia Ryan <pineapple@google.com> Reviewed-by: Prashanth Swaminathan <prashanthsw@google.com> Fuchsia-Auto-Submit: James Robinson <jamesr@google.com>
1 parent bf32fec commit 9faf17d

File tree

249 files changed

+28
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+28
-21
lines changed

‎third_party/rust_crates/BUILD.gn‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3505,8 +3505,8 @@ rust_library("core-foundation-v0_9_2") {
35053505
configs -= [ "//build/config/rust:2018_idioms" ]
35063506

35073507
deps = []
3508-
deps += [ ":core-foundation-sys-v0_8_3" ]
35093508
deps += [ ":libc-v0_2_158" ]
3509+
deps += [ ":core-foundation-sys-v0_8_3" ]
35103510

35113511
rustenv = []
35123512

@@ -3675,12 +3675,12 @@ rust_library("criterion-v0_2_11") {
36753675
deps = []
36763676
deps += [ ":csv-v1_2_1" ]
36773677
deps += [ ":walkdir-v2_3_1" ]
3678+
deps += [ ":libc-v0_2_158" ]
36783679
deps += [ ":atty-v0_2_11" ]
36793680
deps += [ ":cast-v0_2_2" ]
36803681
deps += [ ":clap-v2_34_0" ]
36813682
deps += [ ":itertools-v0_8_0" ]
36823683
deps += [ ":lazy_static-v1_4_0" ]
3683-
deps += [ ":libc-v0_2_158" ]
36843684
deps += [ ":num-traits-v0_2_18" ]
36853685
deps += [ ":rand_core-v0_3_1" ]
36863686
deps += [ ":rand_os-v0_1_2" ]
@@ -5534,9 +5534,9 @@ rust_library("flate2-v1_0_14") {
55345534
configs -= [ "//build/config/rust:2018_idioms" ]
55355535

55365536
deps = []
5537+
deps += [ ":libc-v0_2_158" ]
55375538
deps += [ ":cfg-if-v0_1_10" ]
55385539
deps += [ ":crc32fast-v1_2_0" ]
5539-
deps += [ ":libc-v0_2_158" ]
55405540
deps += [ ":miniz_oxide-v0_3_6" ]
55415541
if (current_cpu == "wasm32" && !false) {
55425542
deps += [ ":miniz_oxide-v0_3_6" ]
@@ -5832,13 +5832,13 @@ rust_library("fuse3-v0_6_1") {
58325832
configs -= [ "//build/config/rust:2018_idioms" ]
58335833

58345834
deps = []
5835+
deps += [ ":libc-v0_2_158" ]
58355836
deps += [ ":async-trait-v0_1_71($host_toolchain)" ]
58365837
deps += [ ":bincode-v1_3_3" ]
58375838
deps += [ ":bytes-v1_6_0" ]
58385839
deps += [ ":cstr-v0_2_11($host_toolchain)" ]
58395840
deps += [ ":futures-channel-v0_3_30" ]
58405841
deps += [ ":futures-util-v0_3_30" ]
5841-
deps += [ ":libc-v0_2_158" ]
58425842
deps += [ ":nix-v0_26_2" ]
58435843
deps += [ ":serde-v1_0_204" ]
58445844
deps += [ ":slab-v0_4_7" ]
@@ -7481,9 +7481,9 @@ rust_library("inotify-v0_9_3") {
74817481
configs -= [ "//build/config/rust:2018_idioms" ]
74827482

74837483
deps = []
7484+
deps += [ ":libc-v0_2_158" ]
74847485
deps += [ ":bitflags-v1_3_2" ]
74857486
deps += [ ":inotify-sys-v0_1_5" ]
7486-
deps += [ ":libc-v0_2_158" ]
74877487

74887488
rustenv = []
74897489

@@ -7869,8 +7869,8 @@ rust_library("kqueue-v1_0_7") {
78697869
configs -= [ "//build/config/rust:2018_idioms" ]
78707870

78717871
deps = []
7872-
deps += [ ":kqueue-sys-v1_0_3" ]
78737872
deps += [ ":libc-v0_2_158" ]
7873+
deps += [ ":kqueue-sys-v1_0_3" ]
78747874

78757875
rustenv = []
78767876

@@ -7899,8 +7899,8 @@ rust_library("kqueue-sys-v1_0_3") {
78997899
configs -= [ "//build/config/rust:2018_idioms" ]
79007900

79017901
deps = []
7902-
deps += [ ":bitflags-v1_3_2" ]
79037902
deps += [ ":libc-v0_2_158" ]
7903+
deps += [ ":bitflags-v1_3_2" ]
79047904

79057905
rustenv = []
79067906

@@ -7949,14 +7949,14 @@ rust_library("lazy_static-v1_4_0") {
79497949
license("libc-v0_2_158.license") {
79507950
public_package_name = "libc"
79517951
license_files = [
7952-
"//third_party/rust_crates/vendor/libc-0.2.158/LICENSE-APACHE",
7953-
"//third_party/rust_crates/vendor/libc-0.2.158/LICENSE-MIT",
7952+
"//third_party/rust_crates/forks/libc-0.2.158/LICENSE-APACHE",
7953+
"//third_party/rust_crates/forks/libc-0.2.158/LICENSE-MIT",
79547954
]
79557955
}
79567956

79577957
rust_library("libc-v0_2_158") {
79587958
crate_name = "libc"
7959-
crate_root = "//third_party/rust_crates/vendor/libc-0.2.158/src/lib.rs"
7959+
crate_root = "//third_party/rust_crates/forks/libc-0.2.158/src/lib.rs"
79607960
output_name = "libc-61b076da7ec586f8"
79617961
configs -= [ "//build/config/rust:2018_idioms" ]
79627962

@@ -8975,9 +8975,9 @@ rust_library("nix-v0_26_2") {
89758975
configs -= [ "//build/config/rust:2018_idioms" ]
89768976

89778977
deps = []
8978+
deps += [ ":libc-v0_2_158" ]
89788979
deps += [ ":bitflags-v1_3_2" ]
89798980
deps += [ ":cfg-if-v1_0_0" ]
8980-
deps += [ ":libc-v0_2_158" ]
89818981
deps += [ ":pin-utils-v0_1_0" ]
89828982
deps += [ ":static_assertions-v1_1_0" ]
89838983
if (!false) {
@@ -9047,9 +9047,9 @@ rust_library("nix-v0_27_1") {
90479047
configs -= [ "//build/config/rust:2018_idioms" ]
90489048

90499049
deps = []
9050+
deps += [ ":libc-v0_2_158" ]
90509051
deps += [ ":bitflags-v2_4_1" ]
90519052
deps += [ ":cfg-if-v1_0_0" ]
9052-
deps += [ ":libc-v0_2_158" ]
90539053
deps += [ ":memoffset-v0_9_1" ]
90549054

90559055
rustenv = []
@@ -9182,9 +9182,9 @@ rust_library("notify-v5_2_0") {
91829182

91839183
deps = []
91849184
deps += [ ":walkdir-v2_3_1" ]
9185+
deps += [ ":libc-v0_2_158" ]
91859186
deps += [ ":bitflags-v1_3_2" ]
91869187
deps += [ ":filetime-v0_2_14" ]
9187-
deps += [ ":libc-v0_2_158" ]
91889188
if (false || false || false || false) {
91899189
deps += [ ":kqueue-v1_0_7" ]
91909190
deps += [ ":mio-v0_8_9" ]
@@ -13521,8 +13521,8 @@ rust_library("rutabaga_gfx-v0_1_3") {
1352113521
configs -= [ "//build/config/rust:2018_idioms" ]
1352213522

1352313523
deps = []
13524-
deps += [ ":cfg-if-v1_0_0" ]
1352513524
deps += [ ":libc-v0_2_158" ]
13525+
deps += [ ":cfg-if-v1_0_0" ]
1352613526
deps += [ ":log-v0_4_22" ]
1352713527
deps += [ ":remain-v0_2_14($host_toolchain)" ]
1352813528
deps += [ ":thiserror-v1_0_57" ]
@@ -13980,10 +13980,10 @@ rust_library("security-framework-v2_3_1") {
1398013980
configs -= [ "//build/config/rust:2018_idioms" ]
1398113981

1398213982
deps = []
13983+
deps += [ ":libc-v0_2_158" ]
1398313984
deps += [ ":bitflags-v1_3_2" ]
1398413985
deps += [ ":core-foundation-sys-v0_8_3" ]
1398513986
deps += [ ":core-foundation-v0_9_2" ]
13986-
deps += [ ":libc-v0_2_158" ]
1398713987
deps += [ ":security-framework-sys-v2_4_2" ]
1398813988

1398913989
rustenv = []
@@ -14017,8 +14017,8 @@ rust_library("security-framework-sys-v2_4_2") {
1401714017
configs -= [ "//build/config/rust:2018_idioms" ]
1401814018

1401914019
deps = []
14020-
deps += [ ":core-foundation-sys-v0_8_3" ]
1402114020
deps += [ ":libc-v0_2_158" ]
14021+
deps += [ ":core-foundation-sys-v0_8_3" ]
1402214022

1402314023
rustenv = []
1402414024

@@ -18767,8 +18767,8 @@ rust_library("zstd-safe-v5_0_2+zstd_1_5_2") {
1876718767
configs -= [ "//build/config/rust:2018_idioms" ]
1876818768

1876918769
deps = []
18770-
deps += [ ":zstd-sys-v2_0_1+zstd_1_5_2" ]
1877118770
deps += [ ":libc-v0_2_158" ]
18771+
deps += [ ":zstd-sys-v2_0_1+zstd_1_5_2" ]
1877218772

1877318773
rustenv = []
1877418774

‎third_party/rust_crates/Cargo.lock‎

Lines changed: 0 additions & 2 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ itertools = "0.10"
132132
itoa = "0.4"
133133
json5format = "0.2.6"
134134
lazy_static = "1.4"
135-
libc = { version = "0.2.158", features = ["extra_traits"] }
135+
libc = "0.2.158"
136136
libm = "0.2.1"
137137
linked-hash-map = "0.5.3"
138138
lock_api = "0.4.11"
@@ -380,6 +380,7 @@ askama_derive = { path = "forks/askama_derive" }
380380
fatfs = { path = "forks/fatfs" }
381381
fuse3 = { path = "forks/fuse3" }
382382
hound = { path = "forks/hound" }
383+
libc = { features = ["extra_traits"], path = "forks/libc-0.2.158" }
383384
libm = { path = "forks/libm" }
384385
nom = { path = "forks/nom" }
385386
notify = { path = "forks/notify" }

‎third_party/rust_crates/vendor/libc-0.2.158/.cargo-checksum.json‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/.cargo-checksum.json‎

File renamed without changes.

‎third_party/rust_crates/vendor/libc-0.2.158/CHANGELOG.md‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/CHANGELOG.md‎

‎third_party/rust_crates/vendor/libc-0.2.158/CONTRIBUTING.md‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/CONTRIBUTING.md‎

‎third_party/rust_crates/vendor/libc-0.2.158/Cargo.toml‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/Cargo.toml‎

File renamed without changes.

‎third_party/rust_crates/vendor/libc-0.2.158/LICENSE-APACHE‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/LICENSE-APACHE‎

File renamed without changes.

‎third_party/rust_crates/vendor/libc-0.2.158/LICENSE-MIT‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/LICENSE-MIT‎

File renamed without changes.

‎third_party/rust_crates/vendor/libc-0.2.158/OWNERS‎ renamed to ‎third_party/rust_crates/forks/libc-0.2.158/OWNERS‎

File renamed without changes.

0 commit comments

Comments
 (0)