diff --git a/MODULE.bazel b/MODULE.bazel index 016004f9f9..d7f9998681 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -112,7 +112,7 @@ use_repo( "cui__cargo-lock-10.1.0", "cui__cargo-platform-0.1.9", "cui__cargo_metadata-0.19.2", - "cui__cargo_toml-0.22.1", + "cui__cargo_toml-0.22.3", "cui__cfg-expr-0.18.0", "cui__clap-4.5.37", "cui__crates-index-3.7.0", @@ -134,7 +134,7 @@ use_repo( "cui__tempfile-3.19.1", "cui__tera-1.20.0", "cui__textwrap-0.16.2", - "cui__toml-0.8.21", + "cui__toml-0.9.5", "cui__tracing-0.1.41", "cui__tracing-subscriber-0.3.19", "cui__url-2.5.4", diff --git a/crate_universe/3rdparty/crates/BUILD.bazel b/crate_universe/3rdparty/crates/BUILD.bazel index 603aa7dc49..96f45e95cd 100644 --- a/crate_universe/3rdparty/crates/BUILD.bazel +++ b/crate_universe/3rdparty/crates/BUILD.bazel @@ -92,14 +92,14 @@ alias( ) alias( - name = "cargo_toml-0.22.1", - actual = "@cui__cargo_toml-0.22.1//:cargo_toml", + name = "cargo_toml-0.22.3", + actual = "@cui__cargo_toml-0.22.3//:cargo_toml", tags = ["manual"], ) alias( name = "cargo_toml", - actual = "@cui__cargo_toml-0.22.1//:cargo_toml", + actual = "@cui__cargo_toml-0.22.3//:cargo_toml", tags = ["manual"], ) @@ -356,14 +356,14 @@ alias( ) alias( - name = "toml-0.8.21", - actual = "@cui__toml-0.8.21//:toml", + name = "toml-0.9.5", + actual = "@cui__toml-0.9.5//:toml", tags = ["manual"], ) alias( name = "toml", - actual = "@cui__toml-0.8.21//:toml", + actual = "@cui__toml-0.9.5//:toml", tags = ["manual"], ) diff --git a/crate_universe/3rdparty/crates/BUILD.cargo-lock-10.1.0.bazel b/crate_universe/3rdparty/crates/BUILD.cargo-lock-10.1.0.bazel index 78aee57246..62b9888a60 100644 --- a/crate_universe/3rdparty/crates/BUILD.cargo-lock-10.1.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.cargo-lock-10.1.0.bazel @@ -101,7 +101,7 @@ rust_library( deps = [ "@cui__semver-1.0.26//:semver", "@cui__serde-1.0.219//:serde", - "@cui__toml-0.8.21//:toml", + "@cui__toml-0.8.19//:toml", "@cui__url-2.5.4//:url", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.1.bazel b/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.3.bazel similarity index 98% rename from crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.1.bazel rename to crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.3.bazel index 69b0a78b91..814479b802 100644 --- a/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.1.bazel +++ b/crate_universe/3rdparty/crates/BUILD.cargo_toml-0.22.3.bazel @@ -97,9 +97,9 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.22.1", + version = "0.22.3", deps = [ "@cui__serde-1.0.219//:serde", - "@cui__toml-0.8.21//:toml", + "@cui__toml-0.9.5//:toml", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.crates-index-3.7.0.bazel b/crate_universe/3rdparty/crates/BUILD.crates-index-3.7.0.bazel index 284e37e7c4..f762c6ac2f 100644 --- a/crate_universe/3rdparty/crates/BUILD.crates-index-3.7.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crates-index-3.7.0.bazel @@ -116,6 +116,6 @@ rust_library( "@cui__serde_json-1.0.140//:serde_json", "@cui__smol_str-0.3.2//:smol_str", "@cui__thiserror-2.0.4//:thiserror", - "@cui__toml-0.8.21//:toml", + "@cui__toml-0.8.19//:toml", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.serde-1.0.219.bazel b/crate_universe/3rdparty/crates/BUILD.serde-1.0.219.bazel index 36c8914364..cabfa5182f 100644 --- a/crate_universe/3rdparty/crates/BUILD.serde-1.0.219.bazel +++ b/crate_universe/3rdparty/crates/BUILD.serde-1.0.219.bazel @@ -39,6 +39,7 @@ rust_library( ], ), crate_features = [ + "alloc", "default", "derive", "rc", @@ -137,6 +138,7 @@ cargo_build_script( ], ), crate_features = [ + "alloc", "default", "derive", "rc", diff --git a/crate_universe/3rdparty/crates/BUILD.serde_spanned-1.0.0.bazel b/crate_universe/3rdparty/crates/BUILD.serde_spanned-1.0.0.bazel new file mode 100644 index 0000000000..62a2fce4cd --- /dev/null +++ b/crate_universe/3rdparty/crates/BUILD.serde_spanned-1.0.0.bazel @@ -0,0 +1,109 @@ +############################################################################### +# @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_toml_env_vars") +load("@rules_rust//rust:defs.bzl", "rust_library") + +package(default_visibility = ["//visibility:public"]) + +cargo_toml_env_vars( + name = "cargo_toml_env_vars", + src = "Cargo.toml", +) + +rust_library( + name = "serde_spanned", + srcs = glob( + include = ["**/*.rs"], + allow_empty = True, + ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), + crate_features = [ + "alloc", + "serde", + "std", + ], + crate_root = "src/lib.rs", + edition = "2021", + rustc_env_files = [ + ":cargo_toml_env_vars", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-bazel", + "crate-name=serde_spanned", + "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-macabi": [], + "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], + "@rules_rust//rust/platform:aarch64-linux-android": [], + "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], + "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], + "@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:aarch64-unknown-uefi": [], + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], + "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], + "@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-linux-gnu": [], + "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], + "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], + "@rules_rust//rust/platform:thumbv6m-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], + "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], + "@rules_rust//rust/platform:wasm32-unknown-unknown": [], + "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], + "@rules_rust//rust/platform:x86_64-apple-darwin": [], + "@rules_rust//rust/platform:x86_64-apple-ios": [], + "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], + "@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-fuchsia": [], + "@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": [], + "@rules_rust//rust/platform:x86_64-unknown-uefi": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = "1.0.0", + deps = [ + "@cui__serde-1.0.219//:serde", + ], +) diff --git a/crate_universe/3rdparty/crates/BUILD.toml-0.8.21.bazel b/crate_universe/3rdparty/crates/BUILD.toml-0.8.19.bazel similarity index 98% rename from crate_universe/3rdparty/crates/BUILD.toml-0.8.21.bazel rename to crate_universe/3rdparty/crates/BUILD.toml-0.8.19.bazel index 881aeaa340..2835685792 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml-0.8.21.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml-0.8.19.bazel @@ -102,11 +102,11 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.8.21", + version = "0.8.19", deps = [ "@cui__serde-1.0.219//:serde", "@cui__serde_spanned-0.6.8//:serde_spanned", "@cui__toml_datetime-0.6.9//:toml_datetime", - "@cui__toml_edit-0.22.25//:toml_edit", + "@cui__toml_edit-0.22.22//:toml_edit", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.toml-0.9.5.bazel b/crate_universe/3rdparty/crates/BUILD.toml-0.9.5.bazel new file mode 100644 index 0000000000..47c641a7cb --- /dev/null +++ b/crate_universe/3rdparty/crates/BUILD.toml-0.9.5.bazel @@ -0,0 +1,116 @@ +############################################################################### +# @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_toml_env_vars") +load("@rules_rust//rust:defs.bzl", "rust_library") + +package(default_visibility = ["//visibility:public"]) + +cargo_toml_env_vars( + name = "cargo_toml_env_vars", + src = "Cargo.toml", +) + +rust_library( + name = "toml", + srcs = glob( + include = ["**/*.rs"], + allow_empty = True, + ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), + crate_features = [ + "default", + "display", + "parse", + "serde", + "std", + ], + crate_root = "src/lib.rs", + edition = "2021", + rustc_env_files = [ + ":cargo_toml_env_vars", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-bazel", + "crate-name=toml", + "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-macabi": [], + "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], + "@rules_rust//rust/platform:aarch64-linux-android": [], + "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], + "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], + "@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:aarch64-unknown-uefi": [], + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], + "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], + "@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-linux-gnu": [], + "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], + "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], + "@rules_rust//rust/platform:thumbv6m-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], + "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], + "@rules_rust//rust/platform:wasm32-unknown-unknown": [], + "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], + "@rules_rust//rust/platform:x86_64-apple-darwin": [], + "@rules_rust//rust/platform:x86_64-apple-ios": [], + "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], + "@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-fuchsia": [], + "@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": [], + "@rules_rust//rust/platform:x86_64-unknown-uefi": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = "0.9.5", + deps = [ + "@cui__serde-1.0.219//:serde", + "@cui__serde_spanned-1.0.0//:serde_spanned", + "@cui__toml_datetime-0.7.0//:toml_datetime", + "@cui__toml_parser-1.1.0-spec-1.1.0//:toml_parser", + "@cui__toml_writer-1.1.0-spec-1.1.0//:toml_writer", + "@cui__winnow-0.7.15//:winnow", + ], +) diff --git a/crate_universe/3rdparty/crates/BUILD.toml_datetime-0.7.0.bazel b/crate_universe/3rdparty/crates/BUILD.toml_datetime-0.7.0.bazel new file mode 100644 index 0000000000..936b062fe3 --- /dev/null +++ b/crate_universe/3rdparty/crates/BUILD.toml_datetime-0.7.0.bazel @@ -0,0 +1,109 @@ +############################################################################### +# @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_toml_env_vars") +load("@rules_rust//rust:defs.bzl", "rust_library") + +package(default_visibility = ["//visibility:public"]) + +cargo_toml_env_vars( + name = "cargo_toml_env_vars", + src = "Cargo.toml", +) + +rust_library( + name = "toml_datetime", + srcs = glob( + include = ["**/*.rs"], + allow_empty = True, + ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), + crate_features = [ + "alloc", + "serde", + "std", + ], + crate_root = "src/lib.rs", + edition = "2021", + rustc_env_files = [ + ":cargo_toml_env_vars", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-bazel", + "crate-name=toml_datetime", + "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-macabi": [], + "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], + "@rules_rust//rust/platform:aarch64-linux-android": [], + "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], + "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], + "@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:aarch64-unknown-uefi": [], + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], + "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], + "@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-linux-gnu": [], + "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], + "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], + "@rules_rust//rust/platform:thumbv6m-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], + "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], + "@rules_rust//rust/platform:wasm32-unknown-unknown": [], + "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], + "@rules_rust//rust/platform:x86_64-apple-darwin": [], + "@rules_rust//rust/platform:x86_64-apple-ios": [], + "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], + "@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-fuchsia": [], + "@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": [], + "@rules_rust//rust/platform:x86_64-unknown-uefi": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = "0.7.0", + deps = [ + "@cui__serde-1.0.219//:serde", + ], +) diff --git a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.25.bazel b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.22.bazel similarity index 97% rename from crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.25.bazel rename to crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.22.bazel index 43c2b7f022..6a76d6b295 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.25.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml_edit-0.22.22.bazel @@ -102,13 +102,12 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.22.25", + version = "0.22.22", deps = [ "@cui__indexmap-2.6.0//:indexmap", "@cui__serde-1.0.219//:serde", "@cui__serde_spanned-0.6.8//:serde_spanned", "@cui__toml_datetime-0.6.9//:toml_datetime", - "@cui__toml_write-0.1.0//:toml_write", - "@cui__winnow-0.7.7//:winnow", + "@cui__winnow-0.6.20//:winnow", ], ) diff --git a/crate_universe/3rdparty/crates/BUILD.toml_parser-1.1.0+spec-1.1.0.bazel b/crate_universe/3rdparty/crates/BUILD.toml_parser-1.1.0+spec-1.1.0.bazel new file mode 100644 index 0000000000..d96507bfed --- /dev/null +++ b/crate_universe/3rdparty/crates/BUILD.toml_parser-1.1.0+spec-1.1.0.bazel @@ -0,0 +1,108 @@ +############################################################################### +# @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_toml_env_vars") +load("@rules_rust//rust:defs.bzl", "rust_library") + +package(default_visibility = ["//visibility:public"]) + +cargo_toml_env_vars( + name = "cargo_toml_env_vars", + src = "Cargo.toml", +) + +rust_library( + name = "toml_parser", + srcs = glob( + include = ["**/*.rs"], + allow_empty = True, + ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), + crate_features = [ + "alloc", + "std", + ], + crate_root = "src/lib.rs", + edition = "2024", + rustc_env_files = [ + ":cargo_toml_env_vars", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-bazel", + "crate-name=toml_parser", + "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-macabi": [], + "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], + "@rules_rust//rust/platform:aarch64-linux-android": [], + "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], + "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], + "@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:aarch64-unknown-uefi": [], + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], + "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], + "@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-linux-gnu": [], + "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], + "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], + "@rules_rust//rust/platform:thumbv6m-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], + "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], + "@rules_rust//rust/platform:wasm32-unknown-unknown": [], + "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], + "@rules_rust//rust/platform:x86_64-apple-darwin": [], + "@rules_rust//rust/platform:x86_64-apple-ios": [], + "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], + "@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-fuchsia": [], + "@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": [], + "@rules_rust//rust/platform:x86_64-unknown-uefi": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = "1.1.0+spec-1.1.0", + deps = [ + "@cui__winnow-1.0.0//:winnow", + ], +) diff --git a/crate_universe/3rdparty/crates/BUILD.toml_write-0.1.0.bazel b/crate_universe/3rdparty/crates/BUILD.toml_writer-1.1.0+spec-1.1.0.bazel similarity index 97% rename from crate_universe/3rdparty/crates/BUILD.toml_write-0.1.0.bazel rename to crate_universe/3rdparty/crates/BUILD.toml_writer-1.1.0+spec-1.1.0.bazel index 1da25bc168..f882c108e8 100644 --- a/crate_universe/3rdparty/crates/BUILD.toml_write-0.1.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.toml_writer-1.1.0+spec-1.1.0.bazel @@ -17,7 +17,7 @@ cargo_toml_env_vars( ) rust_library( - name = "toml_write", + name = "toml_writer", srcs = glob( include = ["**/*.rs"], allow_empty = True, @@ -36,11 +36,10 @@ rust_library( ), crate_features = [ "alloc", - "default", "std", ], crate_root = "src/lib.rs", - edition = "2021", + edition = "2024", rustc_env_files = [ ":cargo_toml_env_vars", ], @@ -49,7 +48,7 @@ rust_library( ], tags = [ "cargo-bazel", - "crate-name=toml_write", + "crate-name=toml_writer", "manual", "noclippy", "norustfmt", @@ -102,5 +101,5 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.1.0", + version = "1.1.0+spec-1.1.0", ) diff --git a/crate_universe/3rdparty/crates/BUILD.winnow-0.7.7.bazel b/crate_universe/3rdparty/crates/BUILD.winnow-0.7.15.bazel similarity index 97% rename from crate_universe/3rdparty/crates/BUILD.winnow-0.7.7.bazel rename to crate_universe/3rdparty/crates/BUILD.winnow-0.7.15.bazel index c188a6b4bf..1ade2628ae 100644 --- a/crate_universe/3rdparty/crates/BUILD.winnow-0.7.7.bazel +++ b/crate_universe/3rdparty/crates/BUILD.winnow-0.7.15.bazel @@ -34,11 +34,6 @@ rust_library( "WORKSPACE.bazel", ], ), - crate_features = [ - "alloc", - "default", - "std", - ], crate_root = "src/lib.rs", edition = "2021", rustc_env_files = [ @@ -102,5 +97,5 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.7.7", + version = "0.7.15", ) diff --git a/crate_universe/3rdparty/crates/BUILD.winnow-1.0.0.bazel b/crate_universe/3rdparty/crates/BUILD.winnow-1.0.0.bazel new file mode 100644 index 0000000000..e0071f16eb --- /dev/null +++ b/crate_universe/3rdparty/crates/BUILD.winnow-1.0.0.bazel @@ -0,0 +1,101 @@ +############################################################################### +# @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_toml_env_vars") +load("@rules_rust//rust:defs.bzl", "rust_library") + +package(default_visibility = ["//visibility:public"]) + +cargo_toml_env_vars( + name = "cargo_toml_env_vars", + src = "Cargo.toml", +) + +rust_library( + name = "winnow", + srcs = glob( + include = ["**/*.rs"], + allow_empty = True, + ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), + crate_root = "src/lib.rs", + edition = "2021", + rustc_env_files = [ + ":cargo_toml_env_vars", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-bazel", + "crate-name=winnow", + "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-macabi": [], + "@rules_rust//rust/platform:aarch64-apple-ios-sim": [], + "@rules_rust//rust/platform:aarch64-linux-android": [], + "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [], + "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [], + "@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:aarch64-unknown-uefi": [], + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [], + "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [], + "@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-linux-gnu": [], + "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [], + "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [], + "@rules_rust//rust/platform:thumbv6m-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabi": [], + "@rules_rust//rust/platform:thumbv7em-none-eabihf": [], + "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [], + "@rules_rust//rust/platform:wasm32-unknown-emscripten": [], + "@rules_rust//rust/platform:wasm32-unknown-unknown": [], + "@rules_rust//rust/platform:wasm32-wasip1": [], + "@rules_rust//rust/platform:wasm32-wasip1-threads": [], + "@rules_rust//rust/platform:wasm32-wasip2": [], + "@rules_rust//rust/platform:x86_64-apple-darwin": [], + "@rules_rust//rust/platform:x86_64-apple-ios": [], + "@rules_rust//rust/platform:x86_64-apple-ios-macabi": [], + "@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-fuchsia": [], + "@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": [], + "@rules_rust//rust/platform:x86_64-unknown-uefi": [], + "//conditions:default": ["@platforms//:incompatible"], + }), + version = "1.0.0", +) diff --git a/crate_universe/3rdparty/crates/defs.bzl b/crate_universe/3rdparty/crates/defs.bzl index b7cdb6fbe9..b7d5269379 100644 --- a/crate_universe/3rdparty/crates/defs.bzl +++ b/crate_universe/3rdparty/crates/defs.bzl @@ -300,7 +300,7 @@ _NORMAL_DEPENDENCIES = { "cargo-lock": Label("@cui//:cargo-lock-10.1.0"), "cargo-platform": Label("@cui//:cargo-platform-0.1.9"), "cargo_metadata": Label("@cui//:cargo_metadata-0.19.2"), - "cargo_toml": Label("@cui//:cargo_toml-0.22.1"), + "cargo_toml": Label("@cui//:cargo_toml-0.22.3"), "cfg-expr": Label("@cui//:cfg-expr-0.18.0"), "clap": Label("@cui//:clap-4.5.37"), "crates-index": Label("@cui//:crates-index-3.7.0"), @@ -320,7 +320,7 @@ _NORMAL_DEPENDENCIES = { "tempfile": Label("@cui//:tempfile-3.19.1"), "tera": Label("@cui//:tera-1.20.0"), "textwrap": Label("@cui//:textwrap-0.16.2"), - "toml": Label("@cui//:toml-0.8.21"), + "toml": Label("@cui//:toml-0.9.5"), "tracing": Label("@cui//:tracing-0.1.41"), "tracing-subscriber": Label("@cui//:tracing-subscriber-0.3.19"), "url": Label("@cui//:url-2.5.4"), @@ -777,12 +777,12 @@ def crate_repositories(): maybe( http_archive, - name = "cui__cargo_toml-0.22.1", - sha256 = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257", + name = "cui__cargo_toml-0.22.3", + sha256 = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77", type = "tar.gz", - urls = ["https://static.crates.io/crates/cargo_toml/0.22.1/download"], - strip_prefix = "cargo_toml-0.22.1", - build_file = Label("//crate_universe/3rdparty/crates:BUILD.cargo_toml-0.22.1.bazel"), + urls = ["https://static.crates.io/crates/cargo_toml/0.22.3/download"], + strip_prefix = "cargo_toml-0.22.3", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.cargo_toml-0.22.3.bazel"), ) maybe( @@ -2335,6 +2335,16 @@ def crate_repositories(): build_file = Label("//crate_universe/3rdparty/crates:BUILD.serde_spanned-0.6.8.bazel"), ) + maybe( + http_archive, + name = "cui__serde_spanned-1.0.0", + sha256 = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83", + type = "tar.gz", + urls = ["https://static.crates.io/crates/serde_spanned/1.0.0/download"], + strip_prefix = "serde_spanned-1.0.0", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.serde_spanned-1.0.0.bazel"), + ) + maybe( http_archive, name = "cui__serde_starlark-0.1.17", @@ -2597,12 +2607,22 @@ def crate_repositories(): maybe( http_archive, - name = "cui__toml-0.8.21", - sha256 = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231", + name = "cui__toml-0.8.19", + sha256 = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e", type = "tar.gz", - urls = ["https://static.crates.io/crates/toml/0.8.21/download"], - strip_prefix = "toml-0.8.21", - build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml-0.8.21.bazel"), + urls = ["https://static.crates.io/crates/toml/0.8.19/download"], + strip_prefix = "toml-0.8.19", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml-0.8.19.bazel"), + ) + + maybe( + http_archive, + name = "cui__toml-0.9.5", + sha256 = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8", + type = "tar.gz", + urls = ["https://static.crates.io/crates/toml/0.9.5/download"], + strip_prefix = "toml-0.9.5", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml-0.9.5.bazel"), ) maybe( @@ -2617,22 +2637,42 @@ def crate_repositories(): maybe( http_archive, - name = "cui__toml_edit-0.22.25", - sha256 = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485", + name = "cui__toml_datetime-0.7.0", + sha256 = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3", type = "tar.gz", - urls = ["https://static.crates.io/crates/toml_edit/0.22.25/download"], - strip_prefix = "toml_edit-0.22.25", - build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_edit-0.22.25.bazel"), + urls = ["https://static.crates.io/crates/toml_datetime/0.7.0/download"], + strip_prefix = "toml_datetime-0.7.0", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_datetime-0.7.0.bazel"), ) maybe( http_archive, - name = "cui__toml_write-0.1.0", - sha256 = "28391a4201ba7eb1984cfeb6862c0b3ea2cfe23332298967c749dddc0d6cd976", + name = "cui__toml_edit-0.22.22", + sha256 = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5", type = "tar.gz", - urls = ["https://static.crates.io/crates/toml_write/0.1.0/download"], - strip_prefix = "toml_write-0.1.0", - build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_write-0.1.0.bazel"), + urls = ["https://static.crates.io/crates/toml_edit/0.22.22/download"], + strip_prefix = "toml_edit-0.22.22", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_edit-0.22.22.bazel"), + ) + + maybe( + http_archive, + name = "cui__toml_parser-1.1.0-spec-1.1.0", + sha256 = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011", + type = "tar.gz", + urls = ["https://static.crates.io/crates/toml_parser/1.1.0+spec-1.1.0/download"], + strip_prefix = "toml_parser-1.1.0+spec-1.1.0", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_parser-1.1.0+spec-1.1.0.bazel"), + ) + + maybe( + http_archive, + name = "cui__toml_writer-1.1.0-spec-1.1.0", + sha256 = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed", + type = "tar.gz", + urls = ["https://static.crates.io/crates/toml_writer/1.1.0+spec-1.1.0/download"], + strip_prefix = "toml_writer-1.1.0+spec-1.1.0", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.toml_writer-1.1.0+spec-1.1.0.bazel"), ) maybe( @@ -3157,12 +3197,22 @@ def crate_repositories(): maybe( http_archive, - name = "cui__winnow-0.7.7", - sha256 = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5", + name = "cui__winnow-0.7.15", + sha256 = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945", + type = "tar.gz", + urls = ["https://static.crates.io/crates/winnow/0.7.15/download"], + strip_prefix = "winnow-0.7.15", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.winnow-0.7.15.bazel"), + ) + + maybe( + http_archive, + name = "cui__winnow-1.0.0", + sha256 = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8", type = "tar.gz", - urls = ["https://static.crates.io/crates/winnow/0.7.7/download"], - strip_prefix = "winnow-0.7.7", - build_file = Label("//crate_universe/3rdparty/crates:BUILD.winnow-0.7.7.bazel"), + urls = ["https://static.crates.io/crates/winnow/1.0.0/download"], + strip_prefix = "winnow-1.0.0", + build_file = Label("//crate_universe/3rdparty/crates:BUILD.winnow-1.0.0.bazel"), ) maybe( @@ -3281,7 +3331,7 @@ def crate_repositories(): struct(repo = "cui__cargo-lock-10.1.0", is_dev_dep = False), struct(repo = "cui__cargo-platform-0.1.9", is_dev_dep = False), struct(repo = "cui__cargo_metadata-0.19.2", is_dev_dep = False), - struct(repo = "cui__cargo_toml-0.22.1", is_dev_dep = False), + struct(repo = "cui__cargo_toml-0.22.3", is_dev_dep = False), struct(repo = "cui__cfg-expr-0.18.0", is_dev_dep = False), struct(repo = "cui__clap-4.5.37", is_dev_dep = False), struct(repo = "cui__crates-index-3.7.0", is_dev_dep = False), @@ -3302,7 +3352,7 @@ def crate_repositories(): struct(repo = "cui__tempfile-3.19.1", is_dev_dep = False), struct(repo = "cui__tera-1.20.0", is_dev_dep = False), struct(repo = "cui__textwrap-0.16.2", is_dev_dep = False), - struct(repo = "cui__toml-0.8.21", is_dev_dep = False), + struct(repo = "cui__toml-0.9.5", is_dev_dep = False), struct(repo = "cui__tracing-0.1.41", is_dev_dep = False), struct(repo = "cui__tracing-subscriber-0.3.19", is_dev_dep = False), struct(repo = "cui__url-2.5.4", is_dev_dep = False), diff --git a/crate_universe/Cargo.lock b/crate_universe/Cargo.lock index 4bebf73ab8..a5c56c60fb 100644 --- a/crate_universe/Cargo.lock +++ b/crate_universe/Cargo.lock @@ -189,7 +189,7 @@ dependencies = [ "tempfile", "tera", "textwrap", - "toml", + "toml 0.9.5", "tracing", "tracing-subscriber", "url", @@ -204,7 +204,7 @@ checksum = "c06acb4f71407ba205a07cb453211e0e6a67b21904e47f6ba1f9589e38f2e454" dependencies = [ "semver", "serde", - "toml", + "toml 0.8.19", "url", ] @@ -233,12 +233,12 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.22.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257" +checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" dependencies = [ "serde", - "toml", + "toml 0.9.5", ] [[package]] @@ -341,7 +341,7 @@ dependencies = [ "serde_json", "smol_str", "thiserror 2.0.4", - "toml", + "toml 0.8.19", ] [[package]] @@ -1967,6 +1967,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + [[package]] name = "serde_starlark" version = "0.1.17" @@ -2206,16 +2215,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.21" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", "toml_edit", ] +[[package]] +name = "toml" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" +dependencies = [ + "indexmap", + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow 0.7.15", +] + [[package]] name = "toml_datetime" version = "0.6.9" @@ -2225,25 +2249,42 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" -version = "0.22.25" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", - "serde_spanned", - "toml_datetime", - "toml_write", - "winnow 0.7.7", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", + "winnow 0.6.20", ] [[package]] -name = "toml_write" -version = "0.1.0" +name = "toml_parser" +version = "1.1.0+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" +dependencies = [ + "winnow 1.0.0", +] + +[[package]] +name = "toml_writer" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28391a4201ba7eb1984cfeb6862c0b3ea2cfe23332298967c749dddc0d6cd976" +checksum = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed" [[package]] name = "tracing" @@ -2666,12 +2707,15 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.7" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" -dependencies = [ - "memchr", -] +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" + +[[package]] +name = "winnow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" [[package]] name = "wit-bindgen-rt" diff --git a/crate_universe/Cargo.toml b/crate_universe/Cargo.toml index 88fb9e6989..ef32a983e0 100644 --- a/crate_universe/Cargo.toml +++ b/crate_universe/Cargo.toml @@ -66,7 +66,7 @@ default = ["cargo"] anyhow = "1.0.98" camino = "1.1.9" cargo_metadata = "0.19.2" -cargo_toml = "0.22.1" +cargo_toml = "0.22.3" cargo-lock = "10.1.0" cargo-platform = "0.1.9" cfg-expr = "0.18.0" @@ -90,7 +90,7 @@ spdx = "0.10.8" tempfile = "3.19.1" tera = { version = "1.20.0", default-features = false } textwrap = "0.16.2" -toml = "0.8.21" +toml = "0.9.0" tracing = "0.1.41" tracing-subscriber = "0.3.19" url = "2.5.4" diff --git a/crate_universe/src/config.rs b/crate_universe/src/config.rs index acbe2c09b9..dae0582c80 100644 --- a/crate_universe/src/config.rs +++ b/crate_universe/src/config.rs @@ -729,10 +729,12 @@ where let value: Option = Option::deserialize(deserializer)?; match value { None | Some(serde_json::Value::Null) => Ok(None), - Some(serde_json::Value::String(s)) => s - .parse::() - .map(Some) - .map_err(serde::de::Error::custom), + Some(serde_json::Value::String(s)) => { + let normalized = s.replace("\r\n", "\n"); + toml::from_str::(&normalized) + .map(Some) + .map_err(serde::de::Error::custom) + } Some(other) => serde_json::from_value(other) .map(Some) .map_err(serde::de::Error::custom),