diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index 0083af8e9..83474b943 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -221,7 +221,7 @@ alias( alias( name = "pin_project", - actual = "@raze__pin_project__0_4_27//:pin_project", + actual = "@raze__pin_project__1_0_1//:pin_project", tags = [ "cargo-raze", "manual", @@ -284,7 +284,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_23_1//:rusqlite", + actual = "@raze__rusqlite__0_24_1//:rusqlite", tags = [ "cargo-raze", "manual", diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock index dc539faed..edd12040d 100644 --- a/cargo/Cargo.lock +++ b/cargo/Cargo.lock @@ -15,6 +15,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +[[package]] +name = "ahash" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c" + [[package]] name = "aho-corasick" version = "0.7.14" @@ -425,7 +431,7 @@ dependencies = [ "num-integer", "num_enum", "once_cell", - "pin-project 0.4.27", + "pin-project 1.0.1", "prost", "prost-build", "pyo3", @@ -776,6 +782,18 @@ name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" +dependencies = [ + "hashbrown", +] [[package]] name = "heck" @@ -1085,21 +1103,15 @@ checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "libsqlite3-sys" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd" +checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" dependencies = [ "cc", "pkg-config", "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" - [[package]] name = "lock_api" version = "0.4.1" @@ -1118,15 +1130,6 @@ dependencies = [ "cfg-if 0.1.10", ] -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "matches" version = "0.1.8" @@ -1784,18 +1787,17 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.23.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d0fd62e1df63d254714e6cb40d0a0e82e7a1623e7a27f679d851af092ae58b" +checksum = "7e3d4791ab5517217f51216a84a688b53c1ebf7988736469c538d02f46ddba68" dependencies = [ "bitflags", "fallible-iterator", "fallible-streaming-iterator", + "hashlink", "libsqlite3-sys", - "lru-cache", "memchr", "smallvec", - "time", ] [[package]] diff --git a/cargo/crates.bzl b/cargo/crates.bzl index fa239a14a..1fc211a2c 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -31,6 +31,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:adler-0.2.3.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__ahash__0_4_6", + url = "https://crates.io/api/v1/crates/ahash/0.4.6/download", + type = "tar.gz", + sha256 = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c", + strip_prefix = "ahash-0.4.6", + build_file = Label("//cargo/remote:ahash-0.4.6.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__aho_corasick__0_7_14", @@ -798,6 +808,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:hashbrown-0.9.1.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__hashlink__0_6_0", + url = "https://crates.io/api/v1/crates/hashlink/0.6.0/download", + type = "tar.gz", + sha256 = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8", + strip_prefix = "hashlink-0.6.0", + build_file = Label("//cargo/remote:hashlink-0.6.0.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__heck__0_3_1", @@ -1108,22 +1128,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__libsqlite3_sys__0_18_0", - url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.18.0/download", + name = "raze__libsqlite3_sys__0_20_1", + url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download", type = "tar.gz", - sha256 = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd", - strip_prefix = "libsqlite3-sys-0.18.0", - build_file = Label("//cargo/remote:libsqlite3-sys-0.18.0.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__linked_hash_map__0_5_3", - url = "https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download", - type = "tar.gz", - sha256 = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a", - strip_prefix = "linked-hash-map-0.5.3", - build_file = Label("//cargo/remote:linked-hash-map-0.5.3.BUILD.bazel"), + sha256 = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd", + strip_prefix = "libsqlite3-sys-0.20.1", + build_file = Label("//cargo/remote:libsqlite3-sys-0.20.1.BUILD.bazel"), ) maybe( @@ -1146,16 +1156,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:log-0.4.11.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__lru_cache__0_1_2", - url = "https://crates.io/api/v1/crates/lru-cache/0.1.2/download", - type = "tar.gz", - sha256 = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c", - strip_prefix = "lru-cache-0.1.2", - build_file = Label("//cargo/remote:lru-cache-0.1.2.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__matches__0_1_8", @@ -1803,12 +1803,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__rusqlite__0_23_1", - url = "https://crates.io/api/v1/crates/rusqlite/0.23.1/download", + name = "raze__rusqlite__0_24_1", + url = "https://crates.io/api/v1/crates/rusqlite/0.24.1/download", type = "tar.gz", - sha256 = "45d0fd62e1df63d254714e6cb40d0a0e82e7a1623e7a27f679d851af092ae58b", - strip_prefix = "rusqlite-0.23.1", - build_file = Label("//cargo/remote:rusqlite-0.23.1.BUILD.bazel"), + sha256 = "7e3d4791ab5517217f51216a84a688b53c1ebf7988736469c538d02f46ddba68", + strip_prefix = "rusqlite-0.24.1", + build_file = Label("//cargo/remote:rusqlite-0.24.1.BUILD.bazel"), ) maybe( diff --git a/cargo/remote/lru-cache-0.1.2.BUILD.bazel b/cargo/remote/ahash-0.4.6.BUILD.bazel similarity index 73% rename from cargo/remote/lru-cache-0.1.2.BUILD.bazel rename to cargo/remote/ahash-0.4.6.BUILD.bazel index c3b696a35..9c7b26962 100644 --- a/cargo/remote/lru-cache-0.1.2.BUILD.bazel +++ b/cargo/remote/ahash-0.4.6.BUILD.bazel @@ -29,21 +29,21 @@ licenses([ ]) # Generated targets +# Unsupported target "ahash" with type "bench" omitted # buildifier: leave-alone rust_library( - name = "lru_cache", + name = "ahash", crate_type = "lib", deps = [ - "@raze__linked_hash_map__0_5_3//:linked_hash_map", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], - version = "0.1.2", + version = "0.4.6", tags = [ "cargo-raze", "manual", @@ -51,3 +51,7 @@ rust_library( crate_features = [ ], ) +# 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/encoding_rs-0.8.24.BUILD.bazel b/cargo/remote/encoding_rs-0.8.24.BUILD.bazel deleted file mode 100644 index 4b13edbd0..000000000 --- a/cargo/remote/encoding_rs-0.8.24.BUILD.bazel +++ /dev/null @@ -1,84 +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 OR 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 = "encoding_rs_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.8.24", - visibility = ["//visibility:private"], -) - - -# buildifier: leave-alone -rust_library( - name = "encoding_rs", - crate_type = "lib", - deps = [ - ":encoding_rs_build_script", - "@raze__cfg_if__0_1_10//:cfg_if", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.8.24", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/hashbrown-0.9.1.BUILD.bazel b/cargo/remote/hashbrown-0.9.1.BUILD.bazel index dc7a0a94c..0452dfe12 100644 --- a/cargo/remote/hashbrown-0.9.1.BUILD.bazel +++ b/cargo/remote/hashbrown-0.9.1.BUILD.bazel @@ -36,6 +36,7 @@ rust_library( name = "hashbrown", crate_type = "lib", deps = [ + "@raze__ahash__0_4_6//:ahash", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", @@ -49,6 +50,9 @@ rust_library( "manual", ], crate_features = [ + "ahash", + "default", + "inline-more", "raw", ], ) diff --git a/cargo/remote/linked-hash-map-0.5.3.BUILD.bazel b/cargo/remote/hashlink-0.6.0.BUILD.bazel similarity index 76% rename from cargo/remote/linked-hash-map-0.5.3.BUILD.bazel rename to cargo/remote/hashlink-0.6.0.BUILD.bazel index 2a16c5440..55f4fc74d 100644 --- a/cargo/remote/linked-hash-map-0.5.3.BUILD.bazel +++ b/cargo/remote/hashlink-0.6.0.BUILD.bazel @@ -29,21 +29,21 @@ licenses([ ]) # Generated targets -# Unsupported target "heapsize" with type "test" omitted # buildifier: leave-alone rust_library( - name = "linked_hash_map", + name = "hashlink", crate_type = "lib", deps = [ + "@raze__hashbrown__0_9_1//:hashbrown", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], - version = "0.5.3", + version = "0.6.0", tags = [ "cargo-raze", "manual", @@ -51,5 +51,7 @@ rust_library( crate_features = [ ], ) +# Unsupported target "linked_hash_map" with type "test" omitted +# Unsupported target "linked_hash_set" with type "test" omitted +# Unsupported target "lru_cache" with type "test" omitted # Unsupported target "serde" with type "test" omitted -# Unsupported target "test" with type "test" omitted diff --git a/cargo/remote/itertools-0.8.2.BUILD.bazel b/cargo/remote/itertools-0.8.2.BUILD.bazel deleted file mode 100644 index 79a206789..000000000 --- a/cargo/remote/itertools-0.8.2.BUILD.bazel +++ /dev/null @@ -1,71 +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 "adaptors_no_collect" with type "test" omitted -# Unsupported target "bench1" with type "bench" omitted -# Unsupported target "combinations_with_replacement" with type "bench" omitted -# Unsupported target "fold_specialization" with type "bench" omitted -# Unsupported target "fold_specialization" with type "test" omitted -# Unsupported target "iris" with type "example" omitted - -# buildifier: leave-alone -rust_library( - name = "itertools", - crate_type = "lib", - deps = [ - "@raze__either__1_6_1//:either", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.8.2", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - "default", - "use_std", - ], -) -# Unsupported target "merge_join" with type "test" omitted -# Unsupported target "peeking_take_while" with type "test" omitted -# Unsupported target "quick" with type "test" omitted -# Unsupported target "test_core" with type "test" omitted -# Unsupported target "test_std" with type "test" omitted -# Unsupported target "tree_fold1" with type "bench" omitted -# Unsupported target "tuple_combinations" with type "bench" omitted -# Unsupported target "tuples" with type "bench" omitted -# Unsupported target "tuples" with type "test" omitted -# Unsupported target "zip" with type "test" omitted diff --git a/cargo/remote/libsqlite3-sys-0.18.0.BUILD.bazel b/cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel similarity index 98% rename from cargo/remote/libsqlite3-sys-0.18.0.BUILD.bazel rename to cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel index ca966daca..c92a12867 100644 --- a/cargo/remote/libsqlite3-sys-0.18.0.BUILD.bazel +++ b/cargo/remote/libsqlite3-sys-0.20.1.BUILD.bazel @@ -75,7 +75,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.18.0", + version = "0.20.1", visibility = ["//visibility:private"], ) @@ -101,7 +101,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.18.0", + version = "0.20.1", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/rusqlite-0.23.1.BUILD.bazel b/cargo/remote/rusqlite-0.24.1.BUILD.bazel similarity index 89% rename from cargo/remote/rusqlite-0.23.1.BUILD.bazel rename to cargo/remote/rusqlite-0.24.1.BUILD.bazel index cfc8c5849..c6c1dffdb 100644 --- a/cargo/remote/rusqlite-0.23.1.BUILD.bazel +++ b/cargo/remote/rusqlite-0.24.1.BUILD.bazel @@ -32,6 +32,7 @@ licenses([ # Unsupported target "cache" with type "bench" omitted # Unsupported target "config_log" with type "test" omitted # Unsupported target "deny_single_threaded_sqlite_config" with type "test" omitted +# Unsupported target "exec" with type "bench" omitted # buildifier: leave-alone rust_library( @@ -41,11 +42,10 @@ rust_library( "@raze__bitflags__1_2_1//:bitflags", "@raze__fallible_iterator__0_2_0//:fallible_iterator", "@raze__fallible_streaming_iterator__0_1_9//:fallible_streaming_iterator", - "@raze__libsqlite3_sys__0_18_0//:libsqlite3_sys", - "@raze__lru_cache__0_1_2//:lru_cache", + "@raze__hashlink__0_6_0//:hashlink", + "@raze__libsqlite3_sys__0_20_1//:libsqlite3_sys", "@raze__memchr__2_3_4//:memchr", "@raze__smallvec__1_4_2//:smallvec", - "@raze__time__0_1_44//:time", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", @@ -53,7 +53,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.23.1", + version = "0.24.1", tags = [ "cargo-raze", "manual", diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 8db24b3dd..042fc1167 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -48,13 +48,13 @@ num_enum = "0.5.0" num-format = "0.4.0" num-integer = "0.1.43" once_cell = "1.4.1" -pin-project = "0.4.22" +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"] } -rusqlite = { version = "0.23.1", features = ["trace", "functions", "collation", "bundled" ]} +rusqlite = { version = "0.24.1", features = ["trace", "functions", "collation", "bundled" ] } scopeguard = "1.1.0" serde = "1.0.114" serde_derive = "1.0.114"