From b8b2e1927ada4ff635f19fa4439981bdb87c2647 Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Thu, 8 Feb 2024 08:23:13 -0800 Subject: [PATCH] Updated crate_universe dependencies to account for rustc nightly version bump --- MODULE.bazel | 2 +- .../3rdparty/crates/BUILD.ahash-0.7.6.bazel | 250 ------------------ crate_universe/3rdparty/crates/BUILD.bazel | 2 +- .../crates/BUILD.cargo_toml-0.17.1.bazel | 2 +- .../crates/BUILD.crates-index-2.2.0.bazel | 2 +- .../3rdparty/crates/BUILD.libc-0.2.149.bazel | 138 +--------- ....bazel => BUILD.serde_spanned-0.6.5.bazel} | 2 +- .../crates/BUILD.textwrap-0.16.0.bazel | 2 +- .../3rdparty/crates/BUILD.toml-0.7.6.bazel | 2 +- ...ml-0.8.6.bazel => BUILD.toml-0.8.10.bazel} | 6 +- .../crates/BUILD.toml_edit-0.19.13.bazel | 2 +- ...0.7.bazel => BUILD.toml_edit-0.22.4.bazel} | 7 +- .../BUILD.unicode-linebreak-0.1.4.bazel | 126 --------- ...el => BUILD.unicode-linebreak-0.1.5.bazel} | 16 +- crate_universe/3rdparty/crates/defs.bzl | 66 ++--- crate_universe/BUILD.bazel | 12 +- crate_universe/Cargo.lock | 52 +--- crate_universe/Cargo.toml | 2 +- crate_universe/src/metadata.rs | 12 + crate_universe/src/splicing/splicer.rs | 77 ++++-- 20 files changed, 147 insertions(+), 633 deletions(-) delete mode 100644 crate_universe/3rdparty/crates/BUILD.ahash-0.7.6.bazel rename crate_universe/3rdparty/crates/{BUILD.serde_spanned-0.6.4.bazel => BUILD.serde_spanned-0.6.5.bazel} (99%) rename crate_universe/3rdparty/crates/{BUILD.toml-0.8.6.bazel => BUILD.toml-0.8.10.bazel} (96%) rename crate_universe/3rdparty/crates/{BUILD.toml_edit-0.20.7.bazel => BUILD.toml_edit-0.22.4.bazel} (96%) delete mode 100644 crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.4.bazel rename crate_universe/3rdparty/crates/{BUILD.hashbrown-0.12.3.bazel => BUILD.unicode-linebreak-0.1.5.bazel} (92%) diff --git a/MODULE.bazel b/MODULE.bazel index 7b8508d4b0..895ba9ce21 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -68,7 +68,7 @@ use_repo( "cui__tempfile-3.8.1", "cui__tera-1.19.1", "cui__textwrap-0.16.0", - "cui__toml-0.8.6", + "cui__toml-0.8.10", "cui__tracing-0.1.40", "cui__tracing-subscriber-0.3.17", "generated_inputs_in_external_repo", diff --git a/crate_universe/3rdparty/crates/BUILD.ahash-0.7.6.bazel b/crate_universe/3rdparty/crates/BUILD.ahash-0.7.6.bazel deleted file mode 100644 index fa6770bec2..0000000000 --- a/crate_universe/3rdparty/crates/BUILD.ahash-0.7.6.bazel +++ /dev/null @@ -1,250 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//crate_universe/3rdparty:crates_vendor -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_build_script") -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -# licenses([ -# "TODO", # MIT OR Apache-2.0 -# ]) - -rust_library( - name = "ahash", - srcs = glob(["**/*.rs"]), - compile_data = glob( - include = ["**"], - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=ahash", - "manual", - "noclippy", - "norustfmt", - ], - target_compatible_with = select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [], - "@rules_rust//rust/platform:aarch64-apple-ios": [], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], - "@rules_rust//rust/platform:aarch64-fuchsia": [], - "@rules_rust//rust/platform:aarch64-linux-android": [], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:armv7-linux-androideabi": [], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:i686-apple-darwin": [], - "@rules_rust//rust/platform:i686-linux-android": [], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [], - "@rules_rust//rust/platform:i686-unknown-freebsd": [], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], - "@rules_rust//rust/platform:thumbv7em-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [], - "@rules_rust//rust/platform:wasm32-wasi": [], - "@rules_rust//rust/platform:x86_64-apple-darwin": [], - "@rules_rust//rust/platform:x86_64-apple-ios": [], - "@rules_rust//rust/platform:x86_64-fuchsia": [], - "@rules_rust//rust/platform:x86_64-linux-android": [], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-none": [], - "//conditions:default": ["@platforms//:incompatible"], - }), - version = "0.7.6", - deps = [ - "@cui__ahash-0.7.6//:build_script_build", - ] + select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-apple-ios": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-fuchsia": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-linux-android": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [ - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:armv7-linux-androideabi": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:i686-apple-darwin": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:i686-linux-android": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:i686-unknown-freebsd": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [ - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [ - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [ - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:wasm32-wasi": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-apple-darwin": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-apple-ios": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-fuchsia": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-linux-android": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [ - "@cui__getrandom-0.2.10//:getrandom", # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "@rules_rust//rust/platform:x86_64-unknown-none": [ - "@cui__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none"))) - ], - "//conditions:default": [], - }), -) - -cargo_build_script( - name = "ahash_build_script", - srcs = glob(["**/*.rs"]), - crate_name = "build_script_build", - crate_root = "build.rs", - data = glob( - include = ["**"], - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=ahash", - "manual", - "noclippy", - "norustfmt", - ], - version = "0.7.6", - visibility = ["//visibility:private"], - deps = [ - "@cui__version_check-0.9.4//:version_check", - ], -) - -alias( - name = "build_script_build", - actual = ":ahash_build_script", - tags = ["manual"], -) diff --git a/crate_universe/3rdparty/crates/BUILD.bazel b/crate_universe/3rdparty/crates/BUILD.bazel index 796463f4cd..03a36a431a 100644 --- a/crate_universe/3rdparty/crates/BUILD.bazel +++ b/crate_universe/3rdparty/crates/BUILD.bazel @@ -177,7 +177,7 @@ alias( alias( name = "toml", - actual = "@cui__toml-0.8.6//:toml", + actual = "@cui__toml-0.8.10//:toml", tags = ["manual"], ) diff --git a/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.17.1.bazel b/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.17.1.bazel index 29b96b890e..14544064bc 100644 --- a/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.17.1.bazel +++ b/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.17.1.bazel @@ -80,6 +80,6 @@ rust_library( version = "0.17.1", deps = [ "@cui__serde-1.0.190//:serde", - "@cui__toml-0.8.6//:toml", + "@cui__toml-0.8.10//:toml", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.crates-index-2.2.0.bazel b/crate_universe/3rdparty/crates/BUILD.crates-index-2.2.0.bazel index 494de9418f..0e99ad8226 100644 --- a/crate_universe/3rdparty/crates/BUILD.crates-index-2.2.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crates-index-2.2.0.bazel @@ -95,6 +95,6 @@ rust_library( "@cui__serde_json-1.0.108//:serde_json", "@cui__smol_str-0.2.0//:smol_str", "@cui__thiserror-1.0.50//:thiserror", - "@cui__toml-0.8.6//:toml", + "@cui__toml-0.8.10//:toml", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel b/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel index af3bd7508c..1a6221af51 100644 --- a/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel +++ b/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel @@ -29,160 +29,99 @@ rust_library( "WORKSPACE.bazel", ], ), - crate_features = select({ + crate_features = [ + "default", + "std", + ] + select({ "@rules_rust//rust/platform:aarch64-apple-darwin": [ - "default", # aarch64-apple-darwin "extra_traits", # aarch64-apple-darwin - "std", # aarch64-apple-darwin ], "@rules_rust//rust/platform:aarch64-apple-ios": [ - "default", # aarch64-apple-ios "extra_traits", # aarch64-apple-ios - "std", # aarch64-apple-ios ], "@rules_rust//rust/platform:aarch64-apple-ios-sim": [ - "default", # aarch64-apple-ios-sim "extra_traits", # aarch64-apple-ios-sim - "std", # aarch64-apple-ios-sim ], "@rules_rust//rust/platform:aarch64-fuchsia": [ - "default", # aarch64-fuchsia "extra_traits", # aarch64-fuchsia - "std", # aarch64-fuchsia ], "@rules_rust//rust/platform:aarch64-linux-android": [ - "default", # aarch64-linux-android "extra_traits", # aarch64-linux-android - "std", # aarch64-linux-android ], "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [ - "default", # aarch64-unknown-linux-gnu "extra_traits", # aarch64-unknown-linux-gnu - "std", # aarch64-unknown-linux-gnu ], "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [ - "default", # aarch64-unknown-nixos-gnu "extra_traits", # aarch64-unknown-nixos-gnu - "std", # aarch64-unknown-nixos-gnu ], "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [ - "default", # aarch64-unknown-nto-qnx710 "extra_traits", # aarch64-unknown-nto-qnx710 - "std", # aarch64-unknown-nto-qnx710 ], "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [ - "default", # arm-unknown-linux-gnueabi "extra_traits", # arm-unknown-linux-gnueabi - "std", # arm-unknown-linux-gnueabi ], "@rules_rust//rust/platform:armv7-linux-androideabi": [ - "default", # armv7-linux-androideabi "extra_traits", # armv7-linux-androideabi - "std", # armv7-linux-androideabi ], "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [ - "default", # armv7-unknown-linux-gnueabi "extra_traits", # armv7-unknown-linux-gnueabi - "std", # armv7-unknown-linux-gnueabi ], "@rules_rust//rust/platform:i686-apple-darwin": [ - "default", # i686-apple-darwin "extra_traits", # i686-apple-darwin - "std", # i686-apple-darwin ], "@rules_rust//rust/platform:i686-linux-android": [ - "default", # i686-linux-android "extra_traits", # i686-linux-android - "std", # i686-linux-android ], "@rules_rust//rust/platform:i686-unknown-freebsd": [ - "default", # i686-unknown-freebsd "extra_traits", # i686-unknown-freebsd - "std", # i686-unknown-freebsd ], "@rules_rust//rust/platform:i686-unknown-linux-gnu": [ - "default", # i686-unknown-linux-gnu "extra_traits", # i686-unknown-linux-gnu - "std", # i686-unknown-linux-gnu ], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [ - "default", # powerpc-unknown-linux-gnu "extra_traits", # powerpc-unknown-linux-gnu - "std", # powerpc-unknown-linux-gnu ], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [ - "default", # riscv32imc-unknown-none-elf "extra_traits", # riscv32imc-unknown-none-elf - "std", # riscv32imc-unknown-none-elf ], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [ - "default", # riscv64gc-unknown-none-elf "extra_traits", # riscv64gc-unknown-none-elf - "std", # riscv64gc-unknown-none-elf ], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [ - "default", # s390x-unknown-linux-gnu "extra_traits", # s390x-unknown-linux-gnu - "std", # s390x-unknown-linux-gnu ], "@rules_rust//rust/platform:thumbv7em-none-eabi": [ - "default", # thumbv7em-none-eabi "extra_traits", # thumbv7em-none-eabi - "std", # thumbv7em-none-eabi ], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [ - "default", # thumbv8m.main-none-eabi "extra_traits", # thumbv8m.main-none-eabi - "std", # thumbv8m.main-none-eabi - ], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [ - "default", # wasm32-unknown-unknown - "std", # wasm32-unknown-unknown ], "@rules_rust//rust/platform:wasm32-wasi": [ - "default", # wasm32-wasi "extra_traits", # wasm32-wasi - "std", # wasm32-wasi ], "@rules_rust//rust/platform:x86_64-apple-darwin": [ - "default", # x86_64-apple-darwin "extra_traits", # x86_64-apple-darwin - "std", # x86_64-apple-darwin ], "@rules_rust//rust/platform:x86_64-apple-ios": [ - "default", # x86_64-apple-ios "extra_traits", # x86_64-apple-ios - "std", # x86_64-apple-ios ], "@rules_rust//rust/platform:x86_64-fuchsia": [ - "default", # x86_64-fuchsia "extra_traits", # x86_64-fuchsia - "std", # x86_64-fuchsia ], "@rules_rust//rust/platform:x86_64-linux-android": [ - "default", # x86_64-linux-android "extra_traits", # x86_64-linux-android - "std", # x86_64-linux-android ], "@rules_rust//rust/platform:x86_64-unknown-freebsd": [ - "default", # x86_64-unknown-freebsd "extra_traits", # x86_64-unknown-freebsd - "std", # x86_64-unknown-freebsd ], "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [ - "default", # x86_64-unknown-linux-gnu "extra_traits", # x86_64-unknown-linux-gnu - "std", # x86_64-unknown-linux-gnu ], "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [ - "default", # x86_64-unknown-nixos-gnu "extra_traits", # x86_64-unknown-nixos-gnu - "std", # x86_64-unknown-nixos-gnu ], "@rules_rust//rust/platform:x86_64-unknown-none": [ - "default", # x86_64-unknown-none "extra_traits", # x86_64-unknown-none - "std", # x86_64-unknown-none ], "//conditions:default": [], }), @@ -244,160 +183,99 @@ rust_library( cargo_build_script( name = "libc_build_script", srcs = glob(["**/*.rs"]), - crate_features = select({ + crate_features = [ + "default", + "std", + ] + select({ "@rules_rust//rust/platform:aarch64-apple-darwin": [ - "default", # aarch64-apple-darwin "extra_traits", # aarch64-apple-darwin - "std", # aarch64-apple-darwin ], "@rules_rust//rust/platform:aarch64-apple-ios": [ - "default", # aarch64-apple-ios "extra_traits", # aarch64-apple-ios - "std", # aarch64-apple-ios ], "@rules_rust//rust/platform:aarch64-apple-ios-sim": [ - "default", # aarch64-apple-ios-sim "extra_traits", # aarch64-apple-ios-sim - "std", # aarch64-apple-ios-sim ], "@rules_rust//rust/platform:aarch64-fuchsia": [ - "default", # aarch64-fuchsia "extra_traits", # aarch64-fuchsia - "std", # aarch64-fuchsia ], "@rules_rust//rust/platform:aarch64-linux-android": [ - "default", # aarch64-linux-android "extra_traits", # aarch64-linux-android - "std", # aarch64-linux-android ], "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [ - "default", # aarch64-unknown-linux-gnu "extra_traits", # aarch64-unknown-linux-gnu - "std", # aarch64-unknown-linux-gnu ], "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [ - "default", # aarch64-unknown-nixos-gnu "extra_traits", # aarch64-unknown-nixos-gnu - "std", # aarch64-unknown-nixos-gnu ], "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [ - "default", # aarch64-unknown-nto-qnx710 "extra_traits", # aarch64-unknown-nto-qnx710 - "std", # aarch64-unknown-nto-qnx710 ], "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [ - "default", # arm-unknown-linux-gnueabi "extra_traits", # arm-unknown-linux-gnueabi - "std", # arm-unknown-linux-gnueabi ], "@rules_rust//rust/platform:armv7-linux-androideabi": [ - "default", # armv7-linux-androideabi "extra_traits", # armv7-linux-androideabi - "std", # armv7-linux-androideabi ], "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [ - "default", # armv7-unknown-linux-gnueabi "extra_traits", # armv7-unknown-linux-gnueabi - "std", # armv7-unknown-linux-gnueabi ], "@rules_rust//rust/platform:i686-apple-darwin": [ - "default", # i686-apple-darwin "extra_traits", # i686-apple-darwin - "std", # i686-apple-darwin ], "@rules_rust//rust/platform:i686-linux-android": [ - "default", # i686-linux-android "extra_traits", # i686-linux-android - "std", # i686-linux-android ], "@rules_rust//rust/platform:i686-unknown-freebsd": [ - "default", # i686-unknown-freebsd "extra_traits", # i686-unknown-freebsd - "std", # i686-unknown-freebsd ], "@rules_rust//rust/platform:i686-unknown-linux-gnu": [ - "default", # i686-unknown-linux-gnu "extra_traits", # i686-unknown-linux-gnu - "std", # i686-unknown-linux-gnu ], "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [ - "default", # powerpc-unknown-linux-gnu "extra_traits", # powerpc-unknown-linux-gnu - "std", # powerpc-unknown-linux-gnu ], "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [ - "default", # riscv32imc-unknown-none-elf "extra_traits", # riscv32imc-unknown-none-elf - "std", # riscv32imc-unknown-none-elf ], "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [ - "default", # riscv64gc-unknown-none-elf "extra_traits", # riscv64gc-unknown-none-elf - "std", # riscv64gc-unknown-none-elf ], "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [ - "default", # s390x-unknown-linux-gnu "extra_traits", # s390x-unknown-linux-gnu - "std", # s390x-unknown-linux-gnu ], "@rules_rust//rust/platform:thumbv7em-none-eabi": [ - "default", # thumbv7em-none-eabi "extra_traits", # thumbv7em-none-eabi - "std", # thumbv7em-none-eabi ], "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [ - "default", # thumbv8m.main-none-eabi "extra_traits", # thumbv8m.main-none-eabi - "std", # thumbv8m.main-none-eabi - ], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [ - "default", # wasm32-unknown-unknown - "std", # wasm32-unknown-unknown ], "@rules_rust//rust/platform:wasm32-wasi": [ - "default", # wasm32-wasi "extra_traits", # wasm32-wasi - "std", # wasm32-wasi ], "@rules_rust//rust/platform:x86_64-apple-darwin": [ - "default", # x86_64-apple-darwin "extra_traits", # x86_64-apple-darwin - "std", # x86_64-apple-darwin ], "@rules_rust//rust/platform:x86_64-apple-ios": [ - "default", # x86_64-apple-ios "extra_traits", # x86_64-apple-ios - "std", # x86_64-apple-ios ], "@rules_rust//rust/platform:x86_64-fuchsia": [ - "default", # x86_64-fuchsia "extra_traits", # x86_64-fuchsia - "std", # x86_64-fuchsia ], "@rules_rust//rust/platform:x86_64-linux-android": [ - "default", # x86_64-linux-android "extra_traits", # x86_64-linux-android - "std", # x86_64-linux-android ], "@rules_rust//rust/platform:x86_64-unknown-freebsd": [ - "default", # x86_64-unknown-freebsd "extra_traits", # x86_64-unknown-freebsd - "std", # x86_64-unknown-freebsd ], "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [ - "default", # x86_64-unknown-linux-gnu "extra_traits", # x86_64-unknown-linux-gnu - "std", # x86_64-unknown-linux-gnu ], "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [ - "default", # x86_64-unknown-nixos-gnu "extra_traits", # x86_64-unknown-nixos-gnu - "std", # x86_64-unknown-nixos-gnu ], "@rules_rust//rust/platform:x86_64-unknown-none": [ - "default", # x86_64-unknown-none "extra_traits", # x86_64-unknown-none - "std", # x86_64-unknown-none ], "//conditions:default": [], }), diff --git a/crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.4.bazel b/crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.5.bazel similarity index 99% rename from crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.4.bazel rename to crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.5.bazel index 19e03bd3e7..2662981ed9 100644 --- a/crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.4.bazel +++ b/crate_universe/3rdparty/crates/BUILD.serde_spanned-0.6.5.bazel @@ -80,7 +80,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-none": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.6.4", + version = "0.6.5", deps = [ "@cui__serde-1.0.190//:serde", ], diff --git a/crate_universe/3rdparty/crates/BUILD.textwrap-0.16.0.bazel b/crate_universe/3rdparty/crates/BUILD.textwrap-0.16.0.bazel index ec1b7bdc08..763f42ba75 100644 --- a/crate_universe/3rdparty/crates/BUILD.textwrap-0.16.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.textwrap-0.16.0.bazel @@ -86,7 +86,7 @@ rust_library( version = "0.16.0", deps = [ "@cui__smawk-0.3.1//:smawk", - "@cui__unicode-linebreak-0.1.4//:unicode_linebreak", + "@cui__unicode-linebreak-0.1.5//:unicode_linebreak", "@cui__unicode-width-0.1.10//:unicode_width", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.toml-0.7.6.bazel b/crate_universe/3rdparty/crates/BUILD.toml-0.7.6.bazel index 9c32e2be0f..c27272b23b 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml-0.7.6.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml-0.7.6.bazel @@ -85,7 +85,7 @@ rust_library( version = "0.7.6", deps = [ "@cui__serde-1.0.190//:serde", - "@cui__serde_spanned-0.6.4//:serde_spanned", + "@cui__serde_spanned-0.6.5//:serde_spanned", "@cui__toml_datetime-0.6.5//:toml_datetime", "@cui__toml_edit-0.19.13//:toml_edit", ], diff --git a/crate_universe/3rdparty/crates/BUILD.toml-0.8.6.bazel b/crate_universe/3rdparty/crates/BUILD.toml-0.8.10.bazel similarity index 96% rename from crate_universe/3rdparty/crates/BUILD.toml-0.8.6.bazel rename to crate_universe/3rdparty/crates/BUILD.toml-0.8.10.bazel index 5feff2442c..cb23bfe58a 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml-0.8.6.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml-0.8.10.bazel @@ -82,11 +82,11 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-none": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.8.6", + version = "0.8.10", deps = [ "@cui__serde-1.0.190//:serde", - "@cui__serde_spanned-0.6.4//:serde_spanned", + "@cui__serde_spanned-0.6.5//:serde_spanned", "@cui__toml_datetime-0.6.5//:toml_datetime", - "@cui__toml_edit-0.20.7//:toml_edit", + "@cui__toml_edit-0.22.4//:toml_edit", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.19.13.bazel b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.19.13.bazel index 6c49361f48..b14dc172a6 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.19.13.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.19.13.bazel @@ -85,7 +85,7 @@ rust_library( deps = [ "@cui__indexmap-2.1.0//:indexmap", "@cui__serde-1.0.190//:serde", - "@cui__serde_spanned-0.6.4//:serde_spanned", + "@cui__serde_spanned-0.6.5//:serde_spanned", "@cui__toml_datetime-0.6.5//:toml_datetime", "@cui__winnow-0.5.18//:winnow", ], diff --git a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.20.7.bazel b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.4.bazel similarity index 96% rename from crate_universe/3rdparty/crates/BUILD.toml_edit-0.20.7.bazel rename to crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.4.bazel index e58278d41d..b8da9d3cf2 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.20.7.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.4.bazel @@ -29,7 +29,8 @@ rust_library( ], ), crate_features = [ - "default", + "display", + "parse", "serde", ], crate_root = "src/lib.rs", @@ -81,11 +82,11 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-none": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.20.7", + version = "0.22.4", deps = [ "@cui__indexmap-2.1.0//:indexmap", "@cui__serde-1.0.190//:serde", - "@cui__serde_spanned-0.6.4//:serde_spanned", + "@cui__serde_spanned-0.6.5//:serde_spanned", "@cui__toml_datetime-0.6.5//:toml_datetime", "@cui__winnow-0.5.18//:winnow", ], diff --git a/crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.4.bazel b/crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.4.bazel deleted file mode 100644 index 17d04672b3..0000000000 --- a/crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.4.bazel +++ /dev/null @@ -1,126 +0,0 @@ -############################################################################### -# @generated -# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To -# regenerate this file, run the following: -# -# bazel run @//crate_universe/3rdparty:crates_vendor -############################################################################### - -load("@rules_rust//cargo:defs.bzl", "cargo_build_script") -load("@rules_rust//rust:defs.bzl", "rust_library") - -package(default_visibility = ["//visibility:public"]) - -# licenses([ -# "TODO", # Apache-2.0 -# ]) - -rust_library( - name = "unicode_linebreak", - srcs = glob(["**/*.rs"]), - compile_data = glob( - include = ["**"], - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - crate_root = "src/lib.rs", - edition = "2021", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=unicode-linebreak", - "manual", - "noclippy", - "norustfmt", - ], - target_compatible_with = select({ - "@rules_rust//rust/platform:aarch64-apple-darwin": [], - "@rules_rust//rust/platform:aarch64-apple-ios": [], - "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], - "@rules_rust//rust/platform:aarch64-fuchsia": [], - "@rules_rust//rust/platform:aarch64-linux-android": [], - "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], - "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [], - "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:armv7-linux-androideabi": [], - "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [], - "@rules_rust//rust/platform:i686-apple-darwin": [], - "@rules_rust//rust/platform:i686-linux-android": [], - "@rules_rust//rust/platform:i686-pc-windows-msvc": [], - "@rules_rust//rust/platform:i686-unknown-freebsd": [], - "@rules_rust//rust/platform:i686-unknown-linux-gnu": [], - "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [], - "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [], - "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], - "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], - "@rules_rust//rust/platform:thumbv7em-none-eabi": [], - "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], - "@rules_rust//rust/platform:wasm32-unknown-unknown": [], - "@rules_rust//rust/platform:wasm32-wasi": [], - "@rules_rust//rust/platform:x86_64-apple-darwin": [], - "@rules_rust//rust/platform:x86_64-apple-ios": [], - "@rules_rust//rust/platform:x86_64-fuchsia": [], - "@rules_rust//rust/platform:x86_64-linux-android": [], - "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [], - "@rules_rust//rust/platform:x86_64-unknown-freebsd": [], - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [], - "@rules_rust//rust/platform:x86_64-unknown-none": [], - "//conditions:default": ["@platforms//:incompatible"], - }), - version = "0.1.4", - deps = [ - "@cui__unicode-linebreak-0.1.4//:build_script_build", - ], -) - -cargo_build_script( - name = "unicode-linebreak_build_script", - srcs = glob(["**/*.rs"]), - crate_name = "build_script_build", - crate_root = "build.rs", - data = glob( - include = ["**"], - exclude = [ - "**/* *", - ".tmp_git_root/**/*", - "BUILD", - "BUILD.bazel", - "WORKSPACE", - "WORKSPACE.bazel", - ], - ), - edition = "2021", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-bazel", - "crate-name=unicode-linebreak", - "manual", - "noclippy", - "norustfmt", - ], - version = "0.1.4", - visibility = ["//visibility:private"], - deps = [ - "@cui__hashbrown-0.12.3//:hashbrown", - "@cui__regex-1.10.2//:regex", - ], -) - -alias( - name = "build_script_build", - actual = ":unicode-linebreak_build_script", - tags = ["manual"], -) diff --git a/crate_universe/3rdparty/crates/BUILD.hashbrown-0.12.3.bazel b/crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.5.bazel similarity index 92% rename from crate_universe/3rdparty/crates/BUILD.hashbrown-0.12.3.bazel rename to crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.5.bazel index 5c25f9e670..ec4a462bdc 100644 --- a/crate_universe/3rdparty/crates/BUILD.hashbrown-0.12.3.bazel +++ b/crate_universe/3rdparty/crates/BUILD.unicode-linebreak-0.1.5.bazel @@ -11,11 +11,11 @@ load("@rules_rust//rust:defs.bzl", "rust_library") package(default_visibility = ["//visibility:public"]) # licenses([ -# "TODO", # MIT OR Apache-2.0 +# "TODO", # Apache-2.0 # ]) rust_library( - name = "hashbrown", + name = "unicode_linebreak", srcs = glob(["**/*.rs"]), compile_data = glob( include = ["**"], @@ -28,11 +28,6 @@ rust_library( "WORKSPACE.bazel", ], ), - crate_features = [ - "ahash", - "default", - "inline-more", - ], crate_root = "src/lib.rs", edition = "2021", rustc_flags = [ @@ -40,7 +35,7 @@ rust_library( ], tags = [ "cargo-bazel", - "crate-name=hashbrown", + "crate-name=unicode-linebreak", "manual", "noclippy", "norustfmt", @@ -82,8 +77,5 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-none": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.12.3", - deps = [ - "@cui__ahash-0.7.6//:ahash", - ], + version = "0.1.5", ) diff --git a/crate_universe/3rdparty/crates/defs.bzl b/crate_universe/3rdparty/crates/defs.bzl index 25ddfa4150..0294eb140e 100644 --- a/crate_universe/3rdparty/crates/defs.bzl +++ b/crate_universe/3rdparty/crates/defs.bzl @@ -317,7 +317,7 @@ _NORMAL_DEPENDENCIES = { "tempfile": "@cui__tempfile-3.8.1//:tempfile", "tera": "@cui__tera-1.19.1//:tera", "textwrap": "@cui__textwrap-0.16.0//:textwrap", - "toml": "@cui__toml-0.8.6//:toml", + "toml": "@cui__toml-0.8.10//:toml", "tracing": "@cui__tracing-0.1.40//:tracing", "tracing-subscriber": "@cui__tracing-subscriber-0.3.17//:tracing_subscriber", }, @@ -481,11 +481,9 @@ _CONDITIONS = { "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"], "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"], "cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"], - "cfg(any(target_os = \"linux\", target_os = \"android\", target_os = \"windows\", target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"dragonfly\", target_os = \"solaris\", target_os = \"illumos\", target_os = \"fuchsia\", target_os = \"redox\", target_os = \"cloudabi\", target_os = \"haiku\", target_os = \"vxworks\", target_os = \"emscripten\", target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"], "cfg(any(target_os = \"macos\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"], "cfg(any(target_os = \"macos\", target_os = \"ios\", target_os = \"freebsd\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-unknown-freebsd"], "cfg(any(unix, target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"], - "cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"], "cfg(not(any(windows, target_os = \"hermit\", target_os = \"unknown\")))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:wasm32-wasi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"], "cfg(not(target_arch = \"wasm32\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"], "cfg(not(target_family = \"wasm\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-fuchsia", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:thumbv7em-none-eabi", "@rules_rust//rust/platform:thumbv8m.main-none-eabi", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-fuchsia", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none"], @@ -550,16 +548,6 @@ def crate_repositories(): build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.adler-1.0.2.bazel"), ) - maybe( - http_archive, - name = "cui__ahash-0.7.6", - sha256 = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47", - type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/ahash/0.7.6/download"], - strip_prefix = "ahash-0.7.6", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.ahash-0.7.6.bazel"), - ) - maybe( http_archive, name = "cui__aho-corasick-1.0.2", @@ -1710,16 +1698,6 @@ def crate_repositories(): build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.globwalk-0.8.1.bazel"), ) - maybe( - http_archive, - name = "cui__hashbrown-0.12.3", - sha256 = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888", - type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/hashbrown/0.12.3/download"], - strip_prefix = "hashbrown-0.12.3", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.hashbrown-0.12.3.bazel"), - ) - maybe( http_archive, name = "cui__hashbrown-0.14.3", @@ -2602,12 +2580,12 @@ def crate_repositories(): maybe( http_archive, - name = "cui__serde_spanned-0.6.4", - sha256 = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80", + name = "cui__serde_spanned-0.6.5", + sha256 = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1", type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/serde_spanned/0.6.4/download"], - strip_prefix = "serde_spanned-0.6.4", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.serde_spanned-0.6.4.bazel"), + urls = ["https://crates.io/api/v1/crates/serde_spanned/0.6.5/download"], + strip_prefix = "serde_spanned-0.6.5", + build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.serde_spanned-0.6.5.bazel"), ) maybe( @@ -2862,12 +2840,12 @@ def crate_repositories(): maybe( http_archive, - name = "cui__toml-0.8.6", - sha256 = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc", + name = "cui__toml-0.8.10", + sha256 = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290", type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/toml/0.8.6/download"], - strip_prefix = "toml-0.8.6", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.toml-0.8.6.bazel"), + urls = ["https://crates.io/api/v1/crates/toml/0.8.10/download"], + strip_prefix = "toml-0.8.10", + build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.toml-0.8.10.bazel"), ) maybe( @@ -2892,12 +2870,12 @@ def crate_repositories(): maybe( http_archive, - name = "cui__toml_edit-0.20.7", - sha256 = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81", + name = "cui__toml_edit-0.22.4", + sha256 = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951", type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/toml_edit/0.20.7/download"], - strip_prefix = "toml_edit-0.20.7", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.toml_edit-0.20.7.bazel"), + urls = ["https://crates.io/api/v1/crates/toml_edit/0.22.4/download"], + strip_prefix = "toml_edit-0.22.4", + build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.toml_edit-0.22.4.bazel"), ) maybe( @@ -3072,12 +3050,12 @@ def crate_repositories(): maybe( http_archive, - name = "cui__unicode-linebreak-0.1.4", - sha256 = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137", + name = "cui__unicode-linebreak-0.1.5", + sha256 = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f", type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download"], - strip_prefix = "unicode-linebreak-0.1.4", - build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.unicode-linebreak-0.1.4.bazel"), + urls = ["https://crates.io/api/v1/crates/unicode-linebreak/0.1.5/download"], + strip_prefix = "unicode-linebreak-0.1.5", + build_file = Label("@rules_rust//crate_universe/3rdparty/crates:BUILD.unicode-linebreak-0.1.5.bazel"), ) maybe( @@ -3384,7 +3362,7 @@ def crate_repositories(): struct(repo = "cui__tempfile-3.8.1", is_dev_dep = False), struct(repo = "cui__tera-1.19.1", is_dev_dep = False), struct(repo = "cui__textwrap-0.16.0", is_dev_dep = False), - struct(repo = "cui__toml-0.8.6", is_dev_dep = False), + struct(repo = "cui__toml-0.8.10", is_dev_dep = False), struct(repo = "cui__tracing-0.1.40", is_dev_dep = False), struct(repo = "cui__tracing-subscriber-0.3.17", is_dev_dep = False), struct(repo = "cui__maplit-1.0.2", is_dev_dep = True), diff --git a/crate_universe/BUILD.bazel b/crate_universe/BUILD.bazel index 424205438a..370dc5c3a2 100644 --- a/crate_universe/BUILD.bazel +++ b/crate_universe/BUILD.bazel @@ -4,7 +4,11 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_doc", "rust_doc_test", " load("//crate_universe:version.bzl", "VERSION") exports_files( - glob(["src/**"]) + [ + glob([ + "src/**/*.bzl", + "src/**/*.j2", + "src/**/*.rs", + ]) + [ "Cargo.toml", "Cargo.lock", "defs.bzl", @@ -32,7 +36,11 @@ bzl_library( filegroup( name = "rust_srcs", - srcs = glob(["src/**/*"]), + srcs = glob([ + "src/**/*.bzl", + "src/**/*.j2", + "src/**/*.rs", + ]), visibility = ["//:__subpackages__"], ) diff --git a/crate_universe/Cargo.lock b/crate_universe/Cargo.lock index c1cdd19f0a..30c841fa7d 100644 --- a/crate_universe/Cargo.lock +++ b/crate_universe/Cargo.lock @@ -8,17 +8,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.0.2" @@ -207,7 +196,7 @@ dependencies = [ "tempfile", "tera", "textwrap", - "toml 0.8.6", + "toml 0.8.10", "tracing", "tracing-subscriber", ] @@ -254,7 +243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d1ece59890e746567b467253aea0adbe8a21784d0b025d8a306f66c391c2957" dependencies = [ "serde", - "toml 0.8.6", + "toml 0.8.10", ] [[package]] @@ -397,7 +386,7 @@ dependencies = [ "serde_json", "smol_str", "thiserror", - "toml 0.8.6", + "toml 0.8.10", ] [[package]] @@ -936,7 +925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", - "hashbrown 0.14.3", + "hashbrown", "parking_lot", ] @@ -1383,15 +1372,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1495,7 +1475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -2185,9 +2165,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2435,14 +2415,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.7", + "toml_edit 0.22.4", ] [[package]] @@ -2469,9 +2449,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ "indexmap", "serde", @@ -2628,13 +2608,9 @@ checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" diff --git a/crate_universe/Cargo.toml b/crate_universe/Cargo.toml index 0608275dab..98bfb4f4fd 100644 --- a/crate_universe/Cargo.toml +++ b/crate_universe/Cargo.toml @@ -48,7 +48,7 @@ sha2 = "0.10.8" tempfile = "3.8.1" tera = "1.19.1" textwrap = "0.16.0" -toml = "0.8.6" +toml = "0.8.10" tracing = "0.1.40" tracing-subscriber = "0.3.17" diff --git a/crate_universe/src/metadata.rs b/crate_universe/src/metadata.rs index 031cacb353..029850aba0 100644 --- a/crate_universe/src/metadata.rs +++ b/crate_universe/src/metadata.rs @@ -161,6 +161,18 @@ impl Cargo { bail!("Couldn't parse cargo version"); } + /// Determine if Cargo is expected to be using the new package_id spec. For + /// details see + pub fn uses_new_package_id_format(&self) -> Result { + let full_version = self.full_version()?; + let version_str = full_version.split(' ').nth(1); + if let Some(version_str) = version_str { + let version = Version::parse(version_str).context("Failed to parse cargo version")?; + return Ok(version.major >= 1 && version.minor >= 78); + } + bail!("Couldn't parse cargo version"); + } + fn env(&self) -> Result> { let mut map = BTreeMap::new(); diff --git a/crate_universe/src/splicing/splicer.rs b/crate_universe/src/splicing/splicer.rs index 620036b58c..552d4e165c 100644 --- a/crate_universe/src/splicing/splicer.rs +++ b/crate_universe/src/splicing/splicer.rs @@ -749,6 +749,7 @@ mod test { use cargo_metadata::{MetadataCommand, PackageId}; use maplit::btreeset; + use crate::splicing::Cargo; use crate::utils::starlark::Label; /// Clone and compare two items after calling `.sort()` on them. @@ -1022,7 +1023,12 @@ mod test { (splicing_manifest, cache_dir) } - fn new_package_id(name: &str, workspace_root: &Path, is_root: bool) -> PackageId { + fn new_package_id( + name: &str, + workspace_root: &Path, + is_root: bool, + cargo: &Cargo, + ) -> PackageId { let mut workspace_root = workspace_root.display().to_string(); // On windows, make sure we normalize the path to match what Cargo would @@ -1031,13 +1037,27 @@ mod test { workspace_root = format!("/{}", workspace_root.replace('\\', "/")) }; + // Cargo updated the way package id's are represented. We should make sure + // to render the correct version based on the current cargo binary. + let use_format_v2 = cargo.uses_new_package_id_format().expect( + "Tests should have a fully controlled environment and consistent access to cargo.", + ); + if is_root { PackageId { - repr: format!("{name} 0.0.1 (path+file://{workspace_root})"), + repr: if use_format_v2 { + format!("path+file://{workspace_root}#{name}@0.0.1") + } else { + format!("{name} 0.0.1 (path+file://{workspace_root})") + }, } } else { PackageId { - repr: format!("{name} 0.0.1 (path+file://{workspace_root}/{name})"), + repr: if use_format_v2 { + format!("path+file://{workspace_root}/{name}#0.0.1") + } else { + format!("{name} 0.0.1 (path+file://{workspace_root}/{name})") + }, } } } @@ -1054,14 +1074,18 @@ mod test { .splice_workspace(&cargo()) .unwrap(); + // Locate cargo + let (_, cargo_path) = get_cargo_and_rustc_paths(); + let cargo = Cargo::new(cargo_path); + // Ensure metadata is valid let metadata = generate_metadata(workspace_manifest.as_path_buf()); assert_sort_eq!( metadata.workspace_members, vec![ - new_package_id("sub_pkg_a", workspace_root.as_ref(), false), - new_package_id("sub_pkg_b", workspace_root.as_ref(), false), - new_package_id("root_pkg", workspace_root.as_ref(), true), + new_package_id("sub_pkg_a", workspace_root.as_ref(), false, &cargo), + new_package_id("sub_pkg_b", workspace_root.as_ref(), false, &cargo), + new_package_id("root_pkg", workspace_root.as_ref(), true, &cargo), ] ); @@ -1094,14 +1118,18 @@ mod test { .splice_workspace(&cargo()) .unwrap(); + // Locate cargo + let (_, cargo_path) = get_cargo_and_rustc_paths(); + let cargo = Cargo::new(cargo_path); + // Ensure metadata is valid let metadata = generate_metadata(workspace_manifest.as_path_buf()); assert_sort_eq!( metadata.workspace_members, vec![ - new_package_id("sub_pkg_a", workspace_root.as_ref(), false), - new_package_id("sub_pkg_b", workspace_root.as_ref(), false), - new_package_id("root_pkg", workspace_root.as_ref(), true), + new_package_id("sub_pkg_a", workspace_root.as_ref(), false, &cargo), + new_package_id("sub_pkg_b", workspace_root.as_ref(), false, &cargo), + new_package_id("root_pkg", workspace_root.as_ref(), true, &cargo), ] ); @@ -1282,11 +1310,20 @@ mod test { .splice_workspace(&cargo()) .unwrap(); + // Locate cargo + let (_, cargo_path) = get_cargo_and_rustc_paths(); + let cargo = Cargo::new(cargo_path); + // Ensure metadata is valid let metadata = generate_metadata(workspace_manifest.as_path_buf()); assert_sort_eq!( metadata.workspace_members, - vec![new_package_id("root_pkg", workspace_root.as_ref(), true)] + vec![new_package_id( + "root_pkg", + workspace_root.as_ref(), + true, + &cargo + )] ); // Ensure the workspace metadata annotations are not populated @@ -1322,14 +1359,18 @@ mod test { Some(cargo_toml::Resolver::V1) ); + // Locate cargo + let (_, cargo_path) = get_cargo_and_rustc_paths(); + let cargo = Cargo::new(cargo_path); + // Ensure metadata is valid let metadata = generate_metadata(workspace_manifest.as_path_buf()); assert_sort_eq!( metadata.workspace_members, vec![ - new_package_id("pkg_a", workspace_root.as_ref(), false), - new_package_id("pkg_b", workspace_root.as_ref(), false), - new_package_id("pkg_c", workspace_root.as_ref(), false), + new_package_id("pkg_a", workspace_root.as_ref(), false, &cargo), + new_package_id("pkg_b", workspace_root.as_ref(), false, &cargo), + new_package_id("pkg_c", workspace_root.as_ref(), false, &cargo), ] ); @@ -1369,14 +1410,18 @@ mod test { Some(cargo_toml::Resolver::V2) ); + // Locate cargo + let (_, cargo_path) = get_cargo_and_rustc_paths(); + let cargo = Cargo::new(cargo_path); + // Ensure metadata is valid let metadata = generate_metadata(workspace_manifest.as_path_buf()); assert_sort_eq!( metadata.workspace_members, vec![ - new_package_id("pkg_a", workspace_root.as_ref(), false), - new_package_id("pkg_b", workspace_root.as_ref(), false), - new_package_id("pkg_c", workspace_root.as_ref(), false), + new_package_id("pkg_a", workspace_root.as_ref(), false, &cargo), + new_package_id("pkg_b", workspace_root.as_ref(), false, &cargo), + new_package_id("pkg_c", workspace_root.as_ref(), false, &cargo), ] );