From 8b3d964866af772396b826822d217226e15a39f2 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 18 Nov 2021 21:39:23 +1000 Subject: [PATCH] roll rusqlite back due to Windows breakage --- Cargo.lock | 8 +++--- cargo/BUILD.bazel | 2 +- cargo/crates.bzl | 20 +++++++------- cargo/licenses.json | 4 +-- ...azel => BUILD.libsqlite3-sys-0.22.2.bazel} | 26 +++++++++++++++---- ...26.1.bazel => BUILD.rusqlite-0.25.3.bazel} | 4 +-- pylib/rsbridge/cargo/BUILD.bazel | 2 +- rslib/Cargo.toml | 2 +- rslib/cargo/BUILD.bazel | 2 +- rslib/i18n/cargo/BUILD.bazel | 2 +- rslib/i18n_helpers/cargo/BUILD.bazel | 2 +- 11 files changed, 45 insertions(+), 29 deletions(-) rename cargo/remote/{BUILD.libsqlite3-sys-0.23.1.bazel => BUILD.libsqlite3-sys-0.22.2.bazel} (80%) rename cargo/remote/{BUILD.rusqlite-0.26.1.bazel => BUILD.rusqlite-0.25.3.bazel} (95%) diff --git a/Cargo.lock b/Cargo.lock index c21cf9378..c3350199a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1063,9 +1063,9 @@ checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" [[package]] name = "libsqlite3-sys" -version = "0.23.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2" +checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" dependencies = [ "cc", "pkg-config", @@ -1962,9 +1962,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.26.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7" +checksum = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3" dependencies = [ "bitflags", "fallible-iterator", diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index ae2504d25..38de947d4 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -338,7 +338,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_26_1//:rusqlite", + actual = "@raze__rusqlite__0_25_3//:rusqlite", tags = [ "cargo-raze", "manual", diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 792f9f331..c1282d3d7 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -1043,12 +1043,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__libsqlite3_sys__0_23_1", - url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.23.1/download", + name = "raze__libsqlite3_sys__0_22_2", + url = "https://crates.io/api/v1/crates/libsqlite3-sys/0.22.2/download", type = "tar.gz", - sha256 = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2", - strip_prefix = "libsqlite3-sys-0.23.1", - build_file = Label("//cargo/remote:BUILD.libsqlite3-sys-0.23.1.bazel"), + sha256 = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d", + strip_prefix = "libsqlite3-sys-0.22.2", + build_file = Label("//cargo/remote:BUILD.libsqlite3-sys-0.22.2.bazel"), ) maybe( @@ -1913,12 +1913,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__rusqlite__0_26_1", - url = "https://crates.io/api/v1/crates/rusqlite/0.26.1/download", + name = "raze__rusqlite__0_25_3", + url = "https://crates.io/api/v1/crates/rusqlite/0.25.3/download", type = "tar.gz", - sha256 = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7", - strip_prefix = "rusqlite-0.26.1", - build_file = Label("//cargo/remote:BUILD.rusqlite-0.26.1.bazel"), + sha256 = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3", + strip_prefix = "rusqlite-0.25.3", + build_file = Label("//cargo/remote:BUILD.rusqlite-0.25.3.bazel"), ) maybe( diff --git a/cargo/licenses.json b/cargo/licenses.json index 5d842ab67..bcdf02523 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -928,7 +928,7 @@ }, { "name": "libsqlite3-sys", - "version": "0.23.1", + "version": "0.22.2", "authors": "The rusqlite developers", "repository": "https://github.com/rusqlite/rusqlite", "license": "MIT", @@ -1657,7 +1657,7 @@ }, { "name": "rusqlite", - "version": "0.26.1", + "version": "0.25.3", "authors": "The rusqlite developers", "repository": "https://github.com/rusqlite/rusqlite", "license": "MIT", diff --git a/cargo/remote/BUILD.libsqlite3-sys-0.23.1.bazel b/cargo/remote/BUILD.libsqlite3-sys-0.22.2.bazel similarity index 80% rename from cargo/remote/BUILD.libsqlite3-sys-0.23.1.bazel rename to cargo/remote/BUILD.libsqlite3-sys-0.22.2.bazel index d36d2f501..2465c55bf 100644 --- a/cargo/remote/BUILD.libsqlite3-sys-0.23.1.bazel +++ b/cargo/remote/BUILD.libsqlite3-sys-0.22.2.bazel @@ -64,18 +64,27 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.23.1", + version = "0.22.2", visibility = ["//visibility:private"], deps = [ "@raze__cc__1_0_72//:cc", "@raze__pkg_config__0_3_22//:pkg_config", - "@raze__vcpkg__0_2_15//:vcpkg", - ], + ] + selects.with_or({ + # cfg(target_env = "msvc") + ( + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__vcpkg__0_2_15//:vcpkg", + ], + "//conditions:default": [], + }), ) rust_library( name = "libsqlite3_sys", srcs = glob(["**/*.rs"]), + aliases = { + }, crate_features = [ "bundled", "bundled_bindings", @@ -97,9 +106,16 @@ rust_library( "cargo-raze", "manual", ], - version = "0.23.1", + version = "0.22.2", # buildifier: leave-alone deps = [ ":libsqlite3_sys_build_script", - ], + ] + selects.with_or({ + # cfg(target_env = "msvc") + ( + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + ], + "//conditions:default": [], + }), ) diff --git a/cargo/remote/BUILD.rusqlite-0.26.1.bazel b/cargo/remote/BUILD.rusqlite-0.25.3.bazel similarity index 95% rename from cargo/remote/BUILD.rusqlite-0.26.1.bazel rename to cargo/remote/BUILD.rusqlite-0.25.3.bazel index 3cf7d48e4..d46122816 100644 --- a/cargo/remote/BUILD.rusqlite-0.26.1.bazel +++ b/cargo/remote/BUILD.rusqlite-0.25.3.bazel @@ -55,14 +55,14 @@ rust_library( "cargo-raze", "manual", ], - version = "0.26.1", + version = "0.25.3", # buildifier: leave-alone deps = [ "@raze__bitflags__1_3_2//:bitflags", "@raze__fallible_iterator__0_2_0//:fallible_iterator", "@raze__fallible_streaming_iterator__0_1_9//:fallible_streaming_iterator", "@raze__hashlink__0_7_0//:hashlink", - "@raze__libsqlite3_sys__0_23_1//:libsqlite3_sys", + "@raze__libsqlite3_sys__0_22_2//:libsqlite3_sys", "@raze__memchr__2_4_1//:memchr", "@raze__smallvec__1_7_0//:smallvec", ], diff --git a/pylib/rsbridge/cargo/BUILD.bazel b/pylib/rsbridge/cargo/BUILD.bazel index cfb24c3e9..5135919f1 100644 --- a/pylib/rsbridge/cargo/BUILD.bazel +++ b/pylib/rsbridge/cargo/BUILD.bazel @@ -338,7 +338,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_26_1//:rusqlite", + actual = "@raze__rusqlite__0_25_3//:rusqlite", tags = [ "cargo-raze", "manual", diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 1b622d6f6..52fe89f5e 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -61,7 +61,7 @@ reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b "rustls-tls-webpki-roots", "rustls-tls-native-roots", ] } -rusqlite = { version = "0.26.1", features = ["trace", "functions", "collation", "bundled"] } +rusqlite = { version = "0.25.3", features = ["trace", "functions", "collation", "bundled"] } scopeguard = "1.1.0" serde = "1.0.130" serde_derive = "1.0.130" diff --git a/rslib/cargo/BUILD.bazel b/rslib/cargo/BUILD.bazel index cfb24c3e9..5135919f1 100644 --- a/rslib/cargo/BUILD.bazel +++ b/rslib/cargo/BUILD.bazel @@ -338,7 +338,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_26_1//:rusqlite", + actual = "@raze__rusqlite__0_25_3//:rusqlite", tags = [ "cargo-raze", "manual", diff --git a/rslib/i18n/cargo/BUILD.bazel b/rslib/i18n/cargo/BUILD.bazel index cfb24c3e9..5135919f1 100644 --- a/rslib/i18n/cargo/BUILD.bazel +++ b/rslib/i18n/cargo/BUILD.bazel @@ -338,7 +338,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_26_1//:rusqlite", + actual = "@raze__rusqlite__0_25_3//:rusqlite", tags = [ "cargo-raze", "manual", diff --git a/rslib/i18n_helpers/cargo/BUILD.bazel b/rslib/i18n_helpers/cargo/BUILD.bazel index cfb24c3e9..5135919f1 100644 --- a/rslib/i18n_helpers/cargo/BUILD.bazel +++ b/rslib/i18n_helpers/cargo/BUILD.bazel @@ -338,7 +338,7 @@ alias( alias( name = "rusqlite", - actual = "@raze__rusqlite__0_26_1//:rusqlite", + actual = "@raze__rusqlite__0_25_3//:rusqlite", tags = [ "cargo-raze", "manual",