diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock index 05d749e81..1b70bfe4b 100644 --- a/cargo/Cargo.lock +++ b/cargo/Cargo.lock @@ -282,22 +282,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "crc32fast" version = "1.2.1" @@ -584,21 +568,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -926,19 +895,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper", - "native-tls", - "tokio", - "tokio-tls", -] - [[package]] name = "idna" version = "0.2.0" @@ -1211,24 +1167,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" -[[package]] -name = "native-tls" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "net2" version = "0.2.35" @@ -1330,39 +1268,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" -[[package]] -name = "openssl" -version = "0.10.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -dependencies = [ - "bitflags", - "cfg-if 0.1.10", - "foreign-types", - "lazy_static", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "parking_lot" version = "0.11.0" @@ -1745,13 +1650,11 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-timeout", - "hyper-tls", "js-sys", "lazy_static", "log", "mime", "mime_guess", - "native-tls", "percent-encoding", "pin-project-lite", "rustls", @@ -1761,7 +1664,6 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-socks", - "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -1837,16 +1739,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -1863,29 +1755,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "serde" version = "1.0.117" @@ -2261,16 +2130,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-util" version = "0.3.1" diff --git a/cargo/crates.bzl b/cargo/crates.bzl index ff0d715e9..f9d333d1d 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -340,26 +340,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:constant_time_eq-0.1.5.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__core_foundation__0_7_0", - url = "https://crates.io/api/v1/crates/core-foundation/0.7.0/download", - type = "tar.gz", - sha256 = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171", - strip_prefix = "core-foundation-0.7.0", - build_file = Label("//cargo/remote:core-foundation-0.7.0.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__core_foundation_sys__0_7_0", - url = "https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download", - type = "tar.gz", - sha256 = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac", - strip_prefix = "core-foundation-sys-0.7.0", - build_file = Label("//cargo/remote:core-foundation-sys-0.7.0.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__crc32fast__1_2_1", @@ -608,26 +588,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:fnv-1.0.7.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__foreign_types__0_3_2", - url = "https://crates.io/api/v1/crates/foreign-types/0.3.2/download", - type = "tar.gz", - sha256 = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1", - strip_prefix = "foreign-types-0.3.2", - build_file = Label("//cargo/remote:foreign-types-0.3.2.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__foreign_types_shared__0_1_1", - url = "https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download", - type = "tar.gz", - sha256 = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b", - strip_prefix = "foreign-types-shared-0.1.1", - build_file = Label("//cargo/remote:foreign-types-shared-0.1.1.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__fuchsia_zircon__0_3_3", @@ -947,16 +907,6 @@ def raze_fetch_remote_crates(): init_submodules = True, ) - maybe( - http_archive, - name = "raze__hyper_tls__0_4_3", - url = "https://crates.io/api/v1/crates/hyper-tls/0.4.3/download", - type = "tar.gz", - sha256 = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed", - strip_prefix = "hyper-tls-0.4.3", - build_file = Label("//cargo/remote:hyper-tls-0.4.3.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__idna__0_2_0", @@ -1246,16 +1196,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:multimap-0.8.2.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__native_tls__0_2_4", - url = "https://crates.io/api/v1/crates/native-tls/0.2.4/download", - type = "tar.gz", - sha256 = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d", - strip_prefix = "native-tls-0.2.4", - build_file = Label("//cargo/remote:native-tls-0.2.4.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__net2__0_2_35", @@ -1366,36 +1306,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:once_cell-1.4.1.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__openssl__0_10_30", - url = "https://crates.io/api/v1/crates/openssl/0.10.30/download", - type = "tar.gz", - sha256 = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4", - strip_prefix = "openssl-0.10.30", - build_file = Label("//cargo/remote:openssl-0.10.30.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__openssl_probe__0_1_2", - url = "https://crates.io/api/v1/crates/openssl-probe/0.1.2/download", - type = "tar.gz", - sha256 = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de", - strip_prefix = "openssl-probe-0.1.2", - build_file = Label("//cargo/remote:openssl-probe-0.1.2.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__openssl_sys__0_9_58", - url = "https://crates.io/api/v1/crates/openssl-sys/0.9.58/download", - type = "tar.gz", - sha256 = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de", - strip_prefix = "openssl-sys-0.9.58", - build_file = Label("//cargo/remote:openssl-sys-0.9.58.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__parking_lot__0_11_0", @@ -1851,16 +1761,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:ryu-1.0.5.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__schannel__0_1_19", - url = "https://crates.io/api/v1/crates/schannel/0.1.19/download", - type = "tar.gz", - sha256 = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75", - strip_prefix = "schannel-0.1.19", - build_file = Label("//cargo/remote:schannel-0.1.19.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__scopeguard__1_1_0", @@ -1881,26 +1781,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:sct-0.6.0.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__security_framework__0_4_4", - url = "https://crates.io/api/v1/crates/security-framework/0.4.4/download", - type = "tar.gz", - sha256 = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535", - strip_prefix = "security-framework-0.4.4", - build_file = Label("//cargo/remote:security-framework-0.4.4.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__security_framework_sys__0_4_3", - url = "https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download", - type = "tar.gz", - sha256 = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405", - strip_prefix = "security-framework-sys-0.4.3", - build_file = Label("//cargo/remote:security-framework-sys-0.4.3.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__serde__1_0_117", @@ -2280,16 +2160,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:tokio-socks-0.2.2.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__tokio_tls__0_3_1", - url = "https://crates.io/api/v1/crates/tokio-tls/0.3.1/download", - type = "tar.gz", - sha256 = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343", - strip_prefix = "tokio-tls-0.3.1", - build_file = Label("//cargo/remote:tokio-tls-0.3.1.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__tokio_util__0_3_1", diff --git a/cargo/remote/core-foundation-0.7.0.BUILD.bazel b/cargo/remote/core-foundation-0.7.0.BUILD.bazel deleted file mode 100644 index 38abcea78..000000000 --- a/cargo/remote/core-foundation-0.7.0.BUILD.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "core_foundation", - crate_type = "lib", - deps = [ - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", - "@raze__libc__0_2_80//:libc", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.7.0", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) -# Unsupported target "use_macro_outside_crate" with type "test" omitted diff --git a/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel b/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel deleted file mode 100644 index d8f3297e6..000000000 --- a/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel +++ /dev/null @@ -1,83 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets -# buildifier: disable=load-on-top -load( - "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -# buildifier: leave-alone -cargo_build_script( - name = "core_foundation_sys_build_script", - srcs = glob(["**/*.rs"]), - crate_root = "build.rs", - edition = "2015", - deps = [ - ], - rustc_flags = [ - "--cap-lints=allow", - ], - crate_features = [ - ], - build_script_env = { - }, - data = glob(["**"]), - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.0", - visibility = ["//visibility:private"], -) - - -# buildifier: leave-alone -rust_library( - name = "core_foundation_sys", - crate_type = "lib", - deps = [ - ":core_foundation_sys_build_script", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.7.0", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/foreign-types-0.3.2.BUILD.bazel b/cargo/remote/foreign-types-0.3.2.BUILD.bazel deleted file mode 100644 index 602da67d8..000000000 --- a/cargo/remote/foreign-types-0.3.2.BUILD.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "foreign_types", - crate_type = "lib", - deps = [ - "@raze__foreign_types_shared__0_1_1//:foreign_types_shared", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.3.2", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/foreign-types-shared-0.1.1.BUILD.bazel b/cargo/remote/foreign-types-shared-0.1.1.BUILD.bazel deleted file mode 100644 index 0ce45fbb3..000000000 --- a/cargo/remote/foreign-types-shared-0.1.1.BUILD.bazel +++ /dev/null @@ -1,52 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "foreign_types_shared", - crate_type = "lib", - deps = [ - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.1", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/hyper-tls-0.4.3.BUILD.bazel b/cargo/remote/hyper-tls-0.4.3.BUILD.bazel deleted file mode 100644 index 35d2924d6..000000000 --- a/cargo/remote/hyper-tls-0.4.3.BUILD.bazel +++ /dev/null @@ -1,58 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets -# Unsupported target "client" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "hyper_tls", - crate_type = "lib", - deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__hyper__0_13_8//:hyper", - "@raze__native_tls__0_2_4//:native_tls", - "@raze__tokio__0_2_22//:tokio", - "@raze__tokio_tls__0_3_1//:tokio_tls", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.4.3", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/native-tls-0.2.4.BUILD.bazel b/cargo/remote/native-tls-0.2.4.BUILD.bazel deleted file mode 100644 index 34bfc7852..000000000 --- a/cargo/remote/native-tls-0.2.4.BUILD.bazel +++ /dev/null @@ -1,151 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets -# buildifier: disable=load-on-top -load( - "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -# buildifier: leave-alone -cargo_build_script( - name = "native_tls_build_script", - srcs = glob(["**/*.rs"]), - crate_root = "build.rs", - edition = "2015", - deps = [ - ] + selects.with_or({ - # cfg(any(target_os = "macos", target_os = "ios")) - ( - "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", - "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", - ): [ - "@raze__security_framework_sys__0_4_3//:security_framework_sys", - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) - ( - "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", - "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__openssl_sys__0_9_58//:openssl_sys", - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(target_os = "windows") - ( - "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", - "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", - ): [ - ], - "//conditions:default": [], - }), - rustc_flags = [ - "--cap-lints=allow", - ], - crate_features = [ - ], - build_script_env = { - }, - data = glob(["**"]), - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.4", - visibility = ["//visibility:private"], -) - -# Unsupported target "google-connect" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "native_tls", - crate_type = "lib", - deps = [ - ":native_tls_build_script", - ] + selects.with_or({ - # cfg(any(target_os = "macos", target_os = "ios")) - ( - "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", - "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", - ): [ - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__libc__0_2_80//:libc", - "@raze__security_framework__0_4_4//:security_framework", - "@raze__security_framework_sys__0_4_3//:security_framework_sys", - "@raze__tempfile__3_1_0//:tempfile", - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) - ( - "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", - "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__log__0_4_11//:log", - "@raze__openssl__0_10_30//:openssl", - "@raze__openssl_probe__0_1_2//:openssl_probe", - "@raze__openssl_sys__0_9_58//:openssl_sys", - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(target_os = "windows") - ( - "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", - "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", - ): [ - "@raze__schannel__0_1_19//:schannel", - ], - "//conditions:default": [], - }), - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.2.4", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], - aliases = { - }, -) -# Unsupported target "simple-server" with type "example" omitted diff --git a/cargo/remote/openssl-0.10.30.BUILD.bazel b/cargo/remote/openssl-0.10.30.BUILD.bazel deleted file mode 100644 index 965bdf826..000000000 --- a/cargo/remote/openssl-0.10.30.BUILD.bazel +++ /dev/null @@ -1,91 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "Apache-2.0" -]) - -# Generated targets -# buildifier: disable=load-on-top -load( - "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -# buildifier: leave-alone -cargo_build_script( - name = "openssl_build_script", - srcs = glob(["**/*.rs"]), - crate_root = "build.rs", - edition = "2015", - deps = [ - "@raze__openssl_sys__0_9_58//:openssl_sys", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - crate_features = [ - ], - build_script_env = { - }, - data = glob(["**"]), - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.30", - visibility = ["//visibility:private"], -) - -# Unsupported target "mk_certs" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "openssl", - crate_type = "lib", - deps = [ - ":openssl_build_script", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__foreign_types__0_3_2//:foreign_types", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__libc__0_2_80//:libc", - "@raze__openssl_sys__0_9_58//:openssl_sys", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.10.30", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/openssl-probe-0.1.2.BUILD.bazel b/cargo/remote/openssl-probe-0.1.2.BUILD.bazel deleted file mode 100644 index 3dc0e8b05..000000000 --- a/cargo/remote/openssl-probe-0.1.2.BUILD.bazel +++ /dev/null @@ -1,52 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "openssl_probe", - crate_type = "lib", - deps = [ - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.2", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/openssl-sys-0.9.58.BUILD.bazel b/cargo/remote/openssl-sys-0.9.58.BUILD.bazel deleted file mode 100644 index 9bcd63836..000000000 --- a/cargo/remote/openssl-sys-0.9.58.BUILD.bazel +++ /dev/null @@ -1,106 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT" -]) - -# Generated targets -# buildifier: disable=load-on-top -load( - "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -# buildifier: leave-alone -cargo_build_script( - name = "openssl_sys_build_script", - srcs = glob(["**/*.rs"]), - crate_root = "build/main.rs", - edition = "2015", - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - "@raze__cc__1_0_61//:cc", - "@raze__pkg_config__0_3_19//:pkg_config", - ] + selects.with_or({ - # cfg(target_env = "msvc") - ( - "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", - "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", - ): [ - "@raze__vcpkg__0_2_10//:vcpkg", - ], - "//conditions:default": [], - }), - rustc_flags = [ - "--cap-lints=allow", - ], - crate_features = [ - ], - build_script_env = { - }, - data = glob(["**"]), - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.58", - visibility = ["//visibility:private"], -) - - -# buildifier: leave-alone -rust_library( - name = "openssl_sys", - crate_type = "lib", - deps = [ - ":openssl_sys_build_script", - "@raze__libc__0_2_80//:libc", - ] + selects.with_or({ - # cfg(target_env = "msvc") - ( - "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", - "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", - ): [ - ], - "//conditions:default": [], - }), - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.9.58", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], - aliases = { - }, -) diff --git a/cargo/remote/reqwest-0.10.4.BUILD.bazel b/cargo/remote/reqwest-0.10.4.BUILD.bazel index 6305d2e62..0dedf25b4 100644 --- a/cargo/remote/reqwest-0.10.4.BUILD.bazel +++ b/cargo/remote/reqwest-0.10.4.BUILD.bazel @@ -73,12 +73,10 @@ rust_library( "@raze__http_body__0_3_1//:http_body", "@raze__hyper__0_13_8//:hyper", "@raze__hyper_rustls__0_20_0//:hyper_rustls", - "@raze__hyper_tls__0_4_3//:hyper_tls", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_11//:log", "@raze__mime__0_3_16//:mime", "@raze__mime_guess__2_0_3//:mime_guess", - "@raze__native_tls__0_2_4//:native_tls", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_1_11//:pin_project_lite", "@raze__rustls__0_17_0//:rustls", @@ -86,7 +84,6 @@ rust_library( "@raze__tokio__0_2_22//:tokio", "@raze__tokio_rustls__0_13_1//:tokio_rustls", "@raze__tokio_socks__0_2_2//:tokio_socks", - "@raze__tokio_tls__0_3_1//:tokio_tls", "@raze__webpki_roots__0_18_0//:webpki_roots", ], "//conditions:default": [], @@ -113,12 +110,8 @@ rust_library( ], crate_features = [ "__tls", - "default", - "default-tls", "hyper-rustls", - "hyper-tls", "json", - "native-tls-crate", "rustls", "rustls-tls", "serde_json", @@ -126,11 +119,9 @@ rust_library( "stream", "tokio-rustls", "tokio-socks", - "tokio-tls", "webpki-roots", ], aliases = { - "@raze__native_tls__0_2_4//:native_tls": "native_tls_crate", }, ) # Unsupported target "simple" with type "example" omitted diff --git a/cargo/remote/schannel-0.1.19.BUILD.bazel b/cargo/remote/schannel-0.1.19.BUILD.bazel deleted file mode 100644 index ceb0314ad..000000000 --- a/cargo/remote/schannel-0.1.19.BUILD.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "schannel", - crate_type = "lib", - deps = [ - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__winapi__0_3_9//:winapi", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.1.19", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/security-framework-0.4.4.BUILD.bazel b/cargo/remote/security-framework-0.4.4.BUILD.bazel deleted file mode 100644 index 68e3e15ee..000000000 --- a/cargo/remote/security-framework-0.4.4.BUILD.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets -# Unsupported target "client" with type "example" omitted -# Unsupported target "find_internet_password" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "security_framework", - crate_type = "lib", - deps = [ - "@raze__bitflags__1_2_1//:bitflags", - "@raze__core_foundation__0_7_0//:core_foundation", - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", - "@raze__libc__0_2_80//:libc", - "@raze__security_framework_sys__0_4_3//:security_framework_sys", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.4.4", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) -# Unsupported target "set_internet_password" with type "example" omitted diff --git a/cargo/remote/security-framework-sys-0.4.3.BUILD.bazel b/cargo/remote/security-framework-sys-0.4.3.BUILD.bazel deleted file mode 100644 index cf202620a..000000000 --- a/cargo/remote/security-framework-sys-0.4.3.BUILD.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT OR Apache-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_library( - name = "security_framework_sys", - crate_type = "lib", - deps = [ - "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", - "@raze__libc__0_2_80//:libc", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.4.3", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/tokio-tls-0.3.1.BUILD.bazel b/cargo/remote/tokio-tls-0.3.1.BUILD.bazel deleted file mode 100644 index 7b4464d3d..000000000 --- a/cargo/remote/tokio-tls-0.3.1.BUILD.bazel +++ /dev/null @@ -1,87 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -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 from expression "MIT" -]) - -# Generated targets -# Unsupported target "bad" with type "test" omitted -# Unsupported target "download-rust-lang" with type "example" omitted -# Unsupported target "google" with type "test" omitted -# Unsupported target "smoke" with type "test" omitted -# Unsupported target "tls-echo" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "tokio_tls", - crate_type = "lib", - deps = [ - "@raze__native_tls__0_2_4//:native_tls", - "@raze__tokio__0_2_22//:tokio", - ] + selects.with_or({ - # cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios"))) - ( - "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", - "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(any(target_os = "macos", target_os = "ios")) - ( - "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", - "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", - "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", - ): [ - ], - "//conditions:default": [], - }) + selects.with_or({ - # cfg(windows) - ( - "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", - "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", - ): [ - ], - "//conditions:default": [], - }), - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.3.1", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], - aliases = { - }, -) diff --git a/cargo/remote/winapi-0.3.9.BUILD.bazel b/cargo/remote/winapi-0.3.9.BUILD.bazel index 27a5827a9..73c72bf6f 100644 --- a/cargo/remote/winapi-0.3.9.BUILD.bazel +++ b/cargo/remote/winapi-0.3.9.BUILD.bazel @@ -54,8 +54,6 @@ cargo_build_script( "impl-debug", "impl-default", "knownfolders", - "lmcons", - "minschannel", "minwinbase", "minwindef", "ntdef", @@ -64,16 +62,12 @@ cargo_build_script( "objbase", "processenv", "profileapi", - "schannel", - "securitybaseapi", "shlobj", - "sspi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", - "wincrypt", "winerror", "winnt", "winreg", @@ -121,8 +115,6 @@ rust_library( "impl-debug", "impl-default", "knownfolders", - "lmcons", - "minschannel", "minwinbase", "minwindef", "ntdef", @@ -131,16 +123,12 @@ rust_library( "objbase", "processenv", "profileapi", - "schannel", - "securitybaseapi", "shlobj", - "sspi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", - "wincrypt", "winerror", "winnt", "winreg", diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 042fc1167..b5a93a022 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -52,8 +52,8 @@ pin-project = "1" prost = { git = "https://github.com/danburkert/prost.git", rev = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b" } rand = "0.7.3" regex = "1.3.9" -#reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", features = ["json", "socks", "stream", "native-tls-vendored"] } -reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", features = ["json", "socks", "stream", "rustls-tls"] } +#reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", default-features = false, features = ["json", "socks", "stream", "native-tls-vendored"] } +reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", default-features = false, features = ["json", "socks", "stream", "rustls-tls"] } rusqlite = { version = "0.24.1", features = ["trace", "functions", "collation", "bundled" ] } scopeguard = "1.1.0" serde = "1.0.114"