From bc98624bdcf6629c4f3ef4aa139bd4a0892f3744 Mon Sep 17 00:00:00 2001 From: Tiziano Santoro Date: Mon, 20 Apr 2020 16:51:10 +0100 Subject: [PATCH] Remove dependency on `hashbrown` (#870) This was making the build non-deterministic: https://github.com/project-oak/oak/issues/862#issuecomment-616519455 It was introduced in an attempt to make `oak_abi` `no_std` compatible, but that's not necessary any more. Ref #862 --- Cargo.lock | 40 -------- cargo/BUILD | 6 +- cargo/Cargo.toml | 1 - cargo/crates.bzl | 94 ++++--------------- cargo/remote/ahash-0.3.2.BUILD | 50 ---------- cargo/remote/chrono-0.4.11.BUILD | 2 +- cargo/remote/const-random-0.1.8.BUILD | 45 --------- cargo/remote/const-random-macro-0.1.8.BUILD | 44 --------- cargo/remote/hashbrown-0.7.1.BUILD | 53 ----------- ...i-0.1.10.BUILD => hermit-abi-0.1.11.BUILD} | 2 +- ...{hyper-0.13.4.BUILD => hyper-0.13.5.BUILD} | 6 +- ...ct-0.4.8.BUILD => pin-project-0.4.9.BUILD} | 5 +- ...BUILD => pin-project-internal-0.4.9.BUILD} | 2 +- cargo/remote/proc-macro-hack-0.5.15.BUILD | 43 --------- cargo/remote/redox_syscall-0.1.56.BUILD | 46 --------- .../{time-0.1.42.BUILD => time-0.1.43.BUILD} | 3 +- oak/server/rust/oak_abi/BUILD | 1 - oak/server/rust/oak_abi/Cargo.toml | 1 - oak/server/rust/oak_abi/src/label/mod.rs | 2 +- 19 files changed, 32 insertions(+), 414 deletions(-) delete mode 100644 cargo/remote/ahash-0.3.2.BUILD delete mode 100644 cargo/remote/const-random-0.1.8.BUILD delete mode 100644 cargo/remote/const-random-macro-0.1.8.BUILD delete mode 100644 cargo/remote/hashbrown-0.7.1.BUILD rename cargo/remote/{hermit-abi-0.1.10.BUILD => hermit-abi-0.1.11.BUILD} (97%) rename cargo/remote/{hyper-0.13.4.BUILD => hyper-0.13.5.BUILD} (96%) rename cargo/remote/{pin-project-0.4.8.BUILD => pin-project-0.4.9.BUILD} (92%) rename cargo/remote/{pin-project-internal-0.4.8.BUILD => pin-project-internal-0.4.9.BUILD} (97%) delete mode 100644 cargo/remote/proc-macro-hack-0.5.15.BUILD delete mode 100644 cargo/remote/redox_syscall-0.1.56.BUILD rename cargo/remote/{time-0.1.42.BUILD => time-0.1.43.BUILD} (89%) diff --git a/Cargo.lock b/Cargo.lock index 6be2a08486a..110943c37d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,14 +94,6 @@ dependencies = [ name = "aggregator_common" version = "0.1.0" -[[package]] -name = "ahash" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "const-random 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "aho-corasick" version = "0.7.8" @@ -381,24 +373,6 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "const-random" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "const-random-macro 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "const-random-macro" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -721,15 +695,6 @@ dependencies = [ "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "hashbrown" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "heck" version = "0.3.1" @@ -1150,7 +1115,6 @@ dependencies = [ name = "oak_abi" version = "0.1.0" dependencies = [ - "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "oak_utils 0.1.0", "prost 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2814,7 +2778,6 @@ dependencies = [ ] [metadata] -"checksum ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3" "checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" "checksum annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" @@ -2850,8 +2813,6 @@ dependencies = [ "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" -"checksum const-random 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a" -"checksum const-random-macro 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" "checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" @@ -2888,7 +2849,6 @@ dependencies = [ "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" "checksum h2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1" -"checksum hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" "checksum hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" diff --git a/cargo/BUILD b/cargo/BUILD index d44b4ea41dd..f62ab864433 100644 --- a/cargo/BUILD +++ b/cargo/BUILD @@ -12,17 +12,13 @@ alias( name = "byteorder", actual = "@raze__byteorder__1_3_4//:byteorder", ) -alias( - name = "hashbrown", - actual = "@raze__hashbrown__0_7_1//:hashbrown", -) alias( name = "http", actual = "@raze__http__0_2_1//:http", ) alias( name = "hyper", - actual = "@raze__hyper__0_13_4//:hyper", + actual = "@raze__hyper__0_13_5//:hyper", ) alias( name = "indexmap", diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml index cba25919b89..16efa8cb2de 100644 --- a/cargo/Cargo.toml +++ b/cargo/Cargo.toml @@ -8,7 +8,6 @@ path = "fake_lib.rs" [dependencies] byteorder = "*" -hashbrown = "*" http = "*" hyper = "*" # Versions 1.3.x of indexmap have a "clever" feature that auto-detects whether a diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 9dfece7a754..36af79b2acc 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -16,15 +16,6 @@ def _new_git_repository(name, **kwargs): def raze_fetch_remote_crates(): - _new_http_archive( - name = "raze__ahash__0_3_2", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/ahash/ahash-0.3.2.crate", - type = "tar.gz", - strip_prefix = "ahash-0.3.2", - - build_file = Label("//cargo/remote:ahash-0.3.2.BUILD"), - ) - _new_http_archive( name = "raze__anyhow__1_0_28", url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.28.crate", @@ -106,24 +97,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:colored-1.9.3.BUILD"), ) - _new_http_archive( - name = "raze__const_random__0_1_8", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/const-random/const-random-0.1.8.crate", - type = "tar.gz", - strip_prefix = "const-random-0.1.8", - - build_file = Label("//cargo/remote:const-random-0.1.8.BUILD"), - ) - - _new_http_archive( - name = "raze__const_random_macro__0_1_8", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/const-random-macro/const-random-macro-0.1.8.crate", - type = "tar.gz", - strip_prefix = "const-random-macro-0.1.8", - - build_file = Label("//cargo/remote:const-random-macro-0.1.8.BUILD"), - ) - _new_http_archive( name = "raze__either__1_5_3", url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.3.crate", @@ -224,21 +197,12 @@ def raze_fetch_remote_crates(): ) _new_http_archive( - name = "raze__hashbrown__0_7_1", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.7.1.crate", + name = "raze__hermit_abi__0_1_11", + url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.11.crate", type = "tar.gz", - strip_prefix = "hashbrown-0.7.1", + strip_prefix = "hermit-abi-0.1.11", - build_file = Label("//cargo/remote:hashbrown-0.7.1.BUILD"), - ) - - _new_http_archive( - name = "raze__hermit_abi__0_1_10", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.10.crate", - type = "tar.gz", - strip_prefix = "hermit-abi-0.1.10", - - build_file = Label("//cargo/remote:hermit-abi-0.1.10.BUILD"), + build_file = Label("//cargo/remote:hermit-abi-0.1.11.BUILD"), ) _new_http_archive( @@ -269,12 +233,12 @@ def raze_fetch_remote_crates(): ) _new_http_archive( - name = "raze__hyper__0_13_4", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.13.4.crate", + name = "raze__hyper__0_13_5", + url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.13.5.crate", type = "tar.gz", - strip_prefix = "hyper-0.13.4", + strip_prefix = "hyper-0.13.5", - build_file = Label("//cargo/remote:hyper-0.13.4.BUILD"), + build_file = Label("//cargo/remote:hyper-0.13.5.BUILD"), ) _new_http_archive( @@ -458,21 +422,21 @@ def raze_fetch_remote_crates(): ) _new_http_archive( - name = "raze__pin_project__0_4_8", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project/pin-project-0.4.8.crate", + name = "raze__pin_project__0_4_9", + url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project/pin-project-0.4.9.crate", type = "tar.gz", - strip_prefix = "pin-project-0.4.8", + strip_prefix = "pin-project-0.4.9", - build_file = Label("//cargo/remote:pin-project-0.4.8.BUILD"), + build_file = Label("//cargo/remote:pin-project-0.4.9.BUILD"), ) _new_http_archive( - name = "raze__pin_project_internal__0_4_8", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-internal/pin-project-internal-0.4.8.crate", + name = "raze__pin_project_internal__0_4_9", + url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-internal/pin-project-internal-0.4.9.crate", type = "tar.gz", - strip_prefix = "pin-project-internal-0.4.8", + strip_prefix = "pin-project-internal-0.4.9", - build_file = Label("//cargo/remote:pin-project-internal-0.4.8.BUILD"), + build_file = Label("//cargo/remote:pin-project-internal-0.4.9.BUILD"), ) _new_http_archive( @@ -502,15 +466,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:ppv-lite86-0.2.6.BUILD"), ) - _new_http_archive( - name = "raze__proc_macro_hack__0_5_15", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.15.crate", - type = "tar.gz", - strip_prefix = "proc-macro-hack-0.5.15", - - build_file = Label("//cargo/remote:proc-macro-hack-0.5.15.BUILD"), - ) - _new_http_archive( name = "raze__proc_macro2__1_0_10", url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.10.crate", @@ -592,15 +547,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:rand_hc-0.2.0.BUILD"), ) - _new_http_archive( - name = "raze__redox_syscall__0_1_56", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate", - type = "tar.gz", - strip_prefix = "redox_syscall-0.1.56", - - build_file = Label("//cargo/remote:redox_syscall-0.1.56.BUILD"), - ) - _new_http_archive( name = "raze__simple_logger__1_6_0", url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/simple_logger/simple_logger-1.6.0.crate", @@ -629,12 +575,12 @@ def raze_fetch_remote_crates(): ) _new_http_archive( - name = "raze__time__0_1_42", - url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate", + name = "raze__time__0_1_43", + url = "https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate", type = "tar.gz", - strip_prefix = "time-0.1.42", + strip_prefix = "time-0.1.43", - build_file = Label("//cargo/remote:time-0.1.42.BUILD"), + build_file = Label("//cargo/remote:time-0.1.43.BUILD"), ) _new_http_archive( diff --git a/cargo/remote/ahash-0.3.2.BUILD b/cargo/remote/ahash-0.3.2.BUILD deleted file mode 100644 index f8976d7835a..00000000000 --- a/cargo/remote/ahash-0.3.2.BUILD +++ /dev/null @@ -1,50 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # "MIT OR Apache-2.0" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - -# Unsupported target "ahash" with type "bench" omitted - -rust_library( - name = "ahash", - crate_root = "src/lib.rs", - crate_type = "lib", - edition = "2018", - srcs = glob(["**/*.rs"]), - deps = [ - "@raze__const_random__0_1_8//:const_random", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.3.2", - crate_features = [ - "compile-time-rng", - "const-random", - ], -) - -# Unsupported target "bench" with type "test" omitted -# Unsupported target "map" with type "bench" omitted -# Unsupported target "map_tests" with type "test" omitted -# Unsupported target "nopanic" with type "test" omitted diff --git a/cargo/remote/chrono-0.4.11.BUILD b/cargo/remote/chrono-0.4.11.BUILD index 238a2fbd41d..ebc5bd46f84 100644 --- a/cargo/remote/chrono-0.4.11.BUILD +++ b/cargo/remote/chrono-0.4.11.BUILD @@ -34,7 +34,7 @@ rust_library( deps = [ "@raze__num_integer__0_1_42//:num_integer", "@raze__num_traits__0_2_11//:num_traits", - "@raze__time__0_1_42//:time", + "@raze__time__0_1_43//:time", ], rustc_flags = [ "--cap-lints=allow", diff --git a/cargo/remote/const-random-0.1.8.BUILD b/cargo/remote/const-random-0.1.8.BUILD deleted file mode 100644 index f531f36fab9..00000000000 --- a/cargo/remote/const-random-0.1.8.BUILD +++ /dev/null @@ -1,45 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # "MIT OR Apache-2.0" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - - -rust_library( - name = "const_random", - crate_root = "src/lib.rs", - crate_type = "lib", - edition = "2018", - srcs = glob(["**/*.rs"]), - deps = [ - "@raze__const_random_macro__0_1_8//:const_random_macro", - "@raze__proc_macro_hack__0_5_15//:proc_macro_hack", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.8", - crate_features = [ - ], -) - -# Unsupported target "tests" with type "test" omitted diff --git a/cargo/remote/const-random-macro-0.1.8.BUILD b/cargo/remote/const-random-macro-0.1.8.BUILD deleted file mode 100644 index d2a3a3c1911..00000000000 --- a/cargo/remote/const-random-macro-0.1.8.BUILD +++ /dev/null @@ -1,44 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # "MIT OR Apache-2.0" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - - -rust_library( - name = "const_random_macro", - crate_root = "src/lib.rs", - crate_type = "proc-macro", - edition = "2018", - srcs = glob(["**/*.rs"]), - deps = [ - "@raze__getrandom__0_1_14//:getrandom", - "@raze__proc_macro_hack__0_5_15//:proc_macro_hack", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.8", - crate_features = [ - ], -) - diff --git a/cargo/remote/hashbrown-0.7.1.BUILD b/cargo/remote/hashbrown-0.7.1.BUILD deleted file mode 100644 index 7fe2c012628..00000000000 --- a/cargo/remote/hashbrown-0.7.1.BUILD +++ /dev/null @@ -1,53 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # "Apache-2.0,MIT" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - -# Unsupported target "bench" with type "bench" omitted -# Unsupported target "build-script-build" with type "custom-build" omitted - -rust_library( - name = "hashbrown", - crate_root = "src/lib.rs", - crate_type = "lib", - edition = "2018", - srcs = glob(["**/*.rs"]), - deps = [ - "@raze__ahash__0_3_2//:ahash", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.7.1", - crate_features = [ - "ahash", - "ahash-compile-time-rng", - "default", - "inline-more", - ], -) - -# Unsupported target "hasher" with type "test" omitted -# Unsupported target "rayon" with type "test" omitted -# Unsupported target "serde" with type "test" omitted -# Unsupported target "set" with type "test" omitted diff --git a/cargo/remote/hermit-abi-0.1.10.BUILD b/cargo/remote/hermit-abi-0.1.11.BUILD similarity index 97% rename from cargo/remote/hermit-abi-0.1.10.BUILD rename to cargo/remote/hermit-abi-0.1.11.BUILD index 8ba2f89ec66..59ab58d051d 100644 --- a/cargo/remote/hermit-abi-0.1.10.BUILD +++ b/cargo/remote/hermit-abi-0.1.11.BUILD @@ -36,7 +36,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.1.10", + version = "0.1.11", crate_features = [ "default", ], diff --git a/cargo/remote/hyper-0.13.4.BUILD b/cargo/remote/hyper-0.13.5.BUILD similarity index 96% rename from cargo/remote/hyper-0.13.4.BUILD rename to cargo/remote/hyper-0.13.5.BUILD index 8809c89e369..e43219067f2 100644 --- a/cargo/remote/hyper-0.13.4.BUILD +++ b/cargo/remote/hyper-0.13.5.BUILD @@ -52,8 +52,8 @@ rust_library( "@raze__itoa__0_4_5//:itoa", "@raze__log__0_4_8//:log", "@raze__net2__0_2_33//:net2", - "@raze__pin_project__0_4_8//:pin_project", - "@raze__time__0_1_42//:time", + "@raze__pin_project__0_4_9//:pin_project", + "@raze__time__0_1_43//:time", "@raze__tokio__0_2_18//:tokio", "@raze__tower_service__0_3_0//:tower_service", "@raze__want__0_3_0//:want", @@ -61,7 +61,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.13.4", + version = "0.13.5", crate_features = [ "default", "net2", diff --git a/cargo/remote/pin-project-0.4.8.BUILD b/cargo/remote/pin-project-0.4.9.BUILD similarity index 92% rename from cargo/remote/pin-project-0.4.8.BUILD rename to cargo/remote/pin-project-0.4.9.BUILD index a3af0702fa6..046a4243549 100644 --- a/cargo/remote/pin-project-0.4.8.BUILD +++ b/cargo/remote/pin-project-0.4.9.BUILD @@ -27,6 +27,7 @@ load( # Unsupported target "compiletest" with type "test" omitted # Unsupported target "enum-default" with type "example" omitted # Unsupported target "enum-default-expanded" with type "example" omitted +# Unsupported target "no_infer_outlives" with type "test" omitted rust_library( name = "pin_project", @@ -35,12 +36,12 @@ rust_library( edition = "2018", srcs = glob(["**/*.rs"]), deps = [ - "@raze__pin_project_internal__0_4_8//:pin_project_internal", + "@raze__pin_project_internal__0_4_9//:pin_project_internal", ], rustc_flags = [ "--cap-lints=allow", ], - version = "0.4.8", + version = "0.4.9", crate_features = [ ], ) diff --git a/cargo/remote/pin-project-internal-0.4.8.BUILD b/cargo/remote/pin-project-internal-0.4.9.BUILD similarity index 97% rename from cargo/remote/pin-project-internal-0.4.8.BUILD rename to cargo/remote/pin-project-internal-0.4.9.BUILD index 7b70befc0f6..d17c102d4c1 100644 --- a/cargo/remote/pin-project-internal-0.4.8.BUILD +++ b/cargo/remote/pin-project-internal-0.4.9.BUILD @@ -38,7 +38,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.4.8", + version = "0.4.9", crate_features = [ ], ) diff --git a/cargo/remote/proc-macro-hack-0.5.15.BUILD b/cargo/remote/proc-macro-hack-0.5.15.BUILD deleted file mode 100644 index 9f4a03b77ec..00000000000 --- a/cargo/remote/proc-macro-hack-0.5.15.BUILD +++ /dev/null @@ -1,43 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # "MIT OR Apache-2.0" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - -# Unsupported target "compiletest" with type "test" omitted - -rust_library( - name = "proc_macro_hack", - crate_root = "src/lib.rs", - crate_type = "proc-macro", - edition = "2018", - srcs = glob(["**/*.rs"]), - deps = [ - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.5.15", - crate_features = [ - ], -) - diff --git a/cargo/remote/redox_syscall-0.1.56.BUILD b/cargo/remote/redox_syscall-0.1.56.BUILD deleted file mode 100644 index 6f59840d958..00000000000 --- a/cargo/remote/redox_syscall-0.1.56.BUILD +++ /dev/null @@ -1,46 +0,0 @@ -""" -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # "MIT" -]) - -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_library", - "rust_binary", - "rust_test", -) - - -alias( - name = "redox_syscall", - actual = ":syscall", -) - -rust_library( - name = "syscall", - crate_root = "src/lib.rs", - crate_type = "lib", - edition = "2015", - srcs = glob(["**/*.rs"]), - deps = [ - ], - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.56", - crate_features = [ - ], -) - diff --git a/cargo/remote/time-0.1.42.BUILD b/cargo/remote/time-0.1.43.BUILD similarity index 89% rename from cargo/remote/time-0.1.42.BUILD rename to cargo/remote/time-0.1.43.BUILD index 3c28de4d09e..ccb5684d6bb 100644 --- a/cargo/remote/time-0.1.42.BUILD +++ b/cargo/remote/time-0.1.43.BUILD @@ -23,7 +23,6 @@ load( ) -# Unsupported target "precise_time_ns" with type "bench" omitted rust_library( name = "time", @@ -37,7 +36,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.1.42", + version = "0.1.43", crate_features = [ ], ) diff --git a/oak/server/rust/oak_abi/BUILD b/oak/server/rust/oak_abi/BUILD index bb3968a0206..0a212b837c1 100644 --- a/oak/server/rust/oak_abi/BUILD +++ b/oak/server/rust/oak_abi/BUILD @@ -27,7 +27,6 @@ rust_library( crate_type = "rlib", edition = "2018", deps = [ - "//cargo:hashbrown", "//cargo:log", "//cargo:prost", "//cargo:prost_types", diff --git a/oak/server/rust/oak_abi/Cargo.toml b/oak/server/rust/oak_abi/Cargo.toml index 111032404ea..188dff4f7ff 100644 --- a/oak/server/rust/oak_abi/Cargo.toml +++ b/oak/server/rust/oak_abi/Cargo.toml @@ -9,7 +9,6 @@ license = "Apache-2.0" # Note that if new dependencies are added here: # - they need to be synced to //cargo/Cargo.toml # - `cd cargo && cargo raze` needs re-running, and the results checked in -hashbrown = "*" log = "*" prost = "*" prost-types = "*" diff --git a/oak/server/rust/oak_abi/src/label/mod.rs b/oak/server/rust/oak_abi/src/label/mod.rs index 24bfccc71f0..f168083f66f 100644 --- a/oak/server/rust/oak_abi/src/label/mod.rs +++ b/oak/server/rust/oak_abi/src/label/mod.rs @@ -20,8 +20,8 @@ //! binary format. That format is a serialized protocol buffer holding the //! `Label` message defined in the policy.proto file. -use hashbrown::HashSet; use prost::Message; +use std::collections::HashSet; pub use crate::proto::oak::label::*;