Merge "Update quote to 1.0.38" into main
diff --git a/crates/bytemuck_derive/.android-checksum.json b/crates/bytemuck_derive/.android-checksum.json
index bb902cd..76e6007 100644
--- a/crates/bytemuck_derive/.android-checksum.json
+++ b/crates/bytemuck_derive/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"93ee1c559596816b9174b5417b871fb4251c5c90b81ed13c895f1d2ddbd2f985","Android.bp":"0ce2998c18742159c104396fe43a7d7ec5e09ef69039f2094f4b5f4e14ee1712","Cargo.toml":"44530987c58a237137171c46024c0e1748d017857f4e5f3c3a53ffd0fb4b0a09","LICENSE":"26c86e25199583069f0f8205e7a76be5bc10af20d9204df80f281a2ea9520941","LICENSE-APACHE":"26c86e25199583069f0f8205e7a76be5bc10af20d9204df80f281a2ea9520941","LICENSE-MIT":"cec4013700872627ee18d2128d3bbde3e1bf1912a61eec493299dc0f434300fb","LICENSE-ZLIB":"a5748e7b6f484bb179d81e382c7cf9526f2da5dc1b027844ae85ed0b739cb56d","METADATA":"9b63c95b95ffd255174c2f14113c1ec609e408d3505f5882ee933fec50e0222d","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"9ad55c0eb37f7af0fb65cdc127877160ea0f80c5e603baeec8e0d56a5b5561cc","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","changelog.md":"88b295be621a357fe47cb34523ebdc79ea387341438d2a008836a424bef9107f","src/lib.rs":"7457a7a522cd9e3df11e6a19c45430ba75a7a18f4068c682ce916b3d9aa5c3b8","src/traits.rs":"1a932133d6dfb97186fda6c3bcc1ad7529e8cbc9bb8f17904f0f076bd34e4481","tests/basic.rs":"7899d9643c558d46beebae9d3ac2c07705f0128dee6ec35b316c00981e033e4d"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"e4ee0b1bd553e570de5db41cda3940c9b07af519c2fb0f2ab378f342f0e4a92f","Android.bp":"aa6fead74b01d7f33f9df63748546fbfa21d33195de1c5a21b73a94f0327f5de","Cargo.toml":"374db6c8a35d1ce7fa5bac692aa25b958d300143db568f28b89636fb5d57b46f","LICENSE":"26c86e25199583069f0f8205e7a76be5bc10af20d9204df80f281a2ea9520941","LICENSE-APACHE":"26c86e25199583069f0f8205e7a76be5bc10af20d9204df80f281a2ea9520941","LICENSE-MIT":"cec4013700872627ee18d2128d3bbde3e1bf1912a61eec493299dc0f434300fb","LICENSE-ZLIB":"a5748e7b6f484bb179d81e382c7cf9526f2da5dc1b027844ae85ed0b739cb56d","METADATA":"e0a212a08f51629c9cdd4bcec9b7a32caf9b37d0a17b5e9ea3bf7321787efe4c","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"9ad55c0eb37f7af0fb65cdc127877160ea0f80c5e603baeec8e0d56a5b5561cc","cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","changelog.md":"1909a39ed7dfcc2f070340f6814d8b3b32acf0bc17b90bc65b051a074a038816","src/lib.rs":"7457a7a522cd9e3df11e6a19c45430ba75a7a18f4068c682ce916b3d9aa5c3b8","src/traits.rs":"5ac4b210e85fef6de818909063df8dd663c371d4ba6a66de7ba3e0119fc263d8","tests/basic.rs":"efee0fe9c11ecddce8fad32a543fa55a8a567a2bac95cd0814bf4087ba617980"}}
\ No newline at end of file
diff --git a/crates/bytemuck_derive/.cargo-checksum.json b/crates/bytemuck_derive/.cargo-checksum.json
index 6050b77..c94d743 100644
--- a/crates/bytemuck_derive/.cargo-checksum.json
+++ b/crates/bytemuck_derive/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"eb59635b1dbdcebec55b8d659d46ccf8c11a70c29b73aa6e596a36f18430d76f","LICENSE-APACHE":"870e20c217d15bcfcbe53d7c5867cd8fac44a4ca0b41fc1eb843557e16063eba","LICENSE-MIT":"0b2d108c9c686a74ac312990ee8377902756a2a081a7af3b0f9d68abf0a8f1a1","LICENSE-ZLIB":"682b4c81b85e83ce6cc6e1ace38fdd97aeb4de0e972bd2b44aa0916c54af8c96","README.md":"c44fcbb0a6555b948e7c0b26313ecdc5f3079ebd1ae74aadcc42fd1ba1245540","changelog.md":"aa98c2da53872d27a22c05b6ad3f79ab6a2b6d1f0c57d00198d0d6936736288e","src/lib.rs":"4514b4458c6968b6d80815c0d77a3babf341d29484deb9221091311fc90bd482","src/traits.rs":"776a3f915478970ec3e4f5629f50d179094c56cdbe9e2e09e72e13697b359ced","tests/basic.rs":"6bc13c649c0e42b3cb008de7640d8531fa54e61ef1e083b614fd4c3e14b97cb9"},"package":"bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"}
\ No newline at end of file
+{"files":{"Cargo.toml":"11f3717530ac2c9e35e816b5cb27d4368a0d0a7ad59479922d99d569f9669a80","LICENSE-APACHE":"870e20c217d15bcfcbe53d7c5867cd8fac44a4ca0b41fc1eb843557e16063eba","LICENSE-MIT":"0b2d108c9c686a74ac312990ee8377902756a2a081a7af3b0f9d68abf0a8f1a1","LICENSE-ZLIB":"682b4c81b85e83ce6cc6e1ace38fdd97aeb4de0e972bd2b44aa0916c54af8c96","README.md":"c44fcbb0a6555b948e7c0b26313ecdc5f3079ebd1ae74aadcc42fd1ba1245540","changelog.md":"39618d97244931aafa42785cca7900631fc940f1140148cf091484defb5ca93e","src/lib.rs":"4514b4458c6968b6d80815c0d77a3babf341d29484deb9221091311fc90bd482","src/traits.rs":"e46a008f52322aab531d5e34bd52dbfde2ad9ed9ed4dc94cce59e652afe1cdb0","tests/basic.rs":"65bd5619d9277c45d93b2076e5eb167bc68cf9131d38ee954645ab2a51b00319"},"package":"3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"}
\ No newline at end of file
diff --git a/crates/bytemuck_derive/Android.bp b/crates/bytemuck_derive/Android.bp
index 091262b..24bb367 100644
--- a/crates/bytemuck_derive/Android.bp
+++ b/crates/bytemuck_derive/Android.bp
@@ -17,7 +17,7 @@
name: "libbytemuck_derive",
crate_name: "bytemuck_derive",
cargo_env_compat: true,
- cargo_pkg_version: "1.8.0",
+ cargo_pkg_version: "1.8.1",
crate_root: "src/lib.rs",
edition: "2018",
rustlibs: [
diff --git a/crates/bytemuck_derive/Cargo.toml b/crates/bytemuck_derive/Cargo.toml
index db094c0..bb2368b 100644
--- a/crates/bytemuck_derive/Cargo.toml
+++ b/crates/bytemuck_derive/Cargo.toml
@@ -12,7 +12,7 @@
[package]
edition = "2018"
name = "bytemuck_derive"
-version = "1.8.0"
+version = "1.8.1"
authors = ["Lokathor <[email protected]>"]
build = false
autobins = false
diff --git a/crates/bytemuck_derive/METADATA b/crates/bytemuck_derive/METADATA
index 450d3e5..46df856 100644
--- a/crates/bytemuck_derive/METADATA
+++ b/crates/bytemuck_derive/METADATA
@@ -1,17 +1,17 @@
name: "bytemuck_derive"
description: "derive proc-macros for `bytemuck`"
third_party {
- version: "1.8.0"
+ version: "1.8.1"
license_type: NOTICE
last_upgrade_date {
- year: 2024
- month: 12
- day: 19
+ year: 2025
+ month: 1
+ day: 14
}
homepage: "https://crates.io/crates/bytemuck_derive"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/bytemuck_derive/bytemuck_derive-1.8.0.crate"
- version: "1.8.0"
+ value: "https://static.crates.io/crates/bytemuck_derive/bytemuck_derive-1.8.1.crate"
+ version: "1.8.1"
}
}
diff --git a/crates/bytemuck_derive/changelog.md b/crates/bytemuck_derive/changelog.md
index b41af0c..38b8d7f 100644
--- a/crates/bytemuck_derive/changelog.md
+++ b/crates/bytemuck_derive/changelog.md
@@ -1,6 +1,10 @@
## `bytemuck_derive` changelog
+## 1.8.1
+
+* https://github.com/Lokathor/bytemuck/pull/287
+
## 1.8
* [#257](https://github.com/Lokathor/bytemuck/pull/257): Allows deriving Zeroable on some enums.
diff --git a/crates/bytemuck_derive/src/traits.rs b/crates/bytemuck_derive/src/traits.rs
index 50fbfb8..d94c846 100644
--- a/crates/bytemuck_derive/src/traits.rs
+++ b/crates/bytemuck_derive/src/traits.rs
@@ -2,7 +2,7 @@
use std::{cmp, convert::TryFrom};
use proc_macro2::{Ident, Span, TokenStream, TokenTree};
-use quote::{quote, quote_spanned, ToTokens};
+use quote::{quote, ToTokens};
use syn::{
parse::{Parse, ParseStream, Parser},
punctuated::Punctuated,
@@ -553,7 +553,7 @@
/// Extract the `Fields` off a `DeriveInput`, or, in the `enum` case, off
/// those of the `enum_variant`, when provided (e.g., for `Zeroable`).
-///
+///
/// We purposely allow not providing an `enum_variant` for cases where
/// the caller wants to reject supporting `enum`s (e.g., `NoPadding`).
fn get_fields(
@@ -607,19 +607,27 @@
let field_name = &field_names[..];
let field_ty = &field_tys[..];
- let derive_dbg =
- quote!(#[cfg_attr(not(target_arch = "spirv"), derive(Debug))]);
-
Ok((
quote! {
#[doc = #GENERATED_TYPE_DOCUMENTATION]
#repr
#[derive(Clone, Copy, #crate_name::AnyBitPattern)]
- #derive_dbg
#[allow(missing_docs)]
pub struct #bits_ty {
#(#field_name: <#field_ty as #crate_name::CheckedBitPattern>::Bits,)*
}
+
+ #[allow(unexpected_cfgs)]
+ const _: () = {
+ #[cfg(not(target_arch = "spirv"))]
+ impl ::core::fmt::Debug for #bits_ty {
+ fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
+ let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#bits_ty));
+ #(::core::fmt::DebugStruct::field(&mut debug_struct, ::core::stringify!(#field_name), &self.#field_name);)*
+ ::core::fmt::DebugStruct::finish(&mut debug_struct)
+ }
+ }
+ };
},
quote! {
type Bits = #bits_ty;
@@ -664,7 +672,7 @@
)?;
let check = if count == 0 {
- quote_spanned!(span => false)
+ quote!(false)
} else if max - min == count - 1 {
// contiguous range
let min_lit = LitInt::new(&format!("{}", min), span);
@@ -711,9 +719,6 @@
let representation = get_repr(&input.attrs)?;
let vis = &input.vis;
- let derive_dbg =
- quote!(#[cfg_attr(not(target_arch = "spirv"), derive(Debug))]);
-
match representation.repr {
Repr::Rust => unreachable!(),
repr @ (Repr::C | Repr::CWithDiscriminant(_)) => {
@@ -793,13 +798,25 @@
quote! {
#[doc = #GENERATED_TYPE_DOCUMENTATION]
#[derive(::core::clone::Clone, ::core::marker::Copy, #crate_name::AnyBitPattern)]
- #derive_dbg
#bits_repr
#vis struct #bits_ty_ident {
tag: #integer,
payload: #variants_union_ident,
}
+ #[allow(unexpected_cfgs)]
+ const _: () = {
+ #[cfg(not(target_arch = "spirv"))]
+ impl ::core::fmt::Debug for #bits_ty_ident {
+ fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
+ let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#bits_ty_ident));
+ ::core::fmt::DebugStruct::field(&mut debug_struct, "tag", &self.tag);
+ ::core::fmt::DebugStruct::field(&mut debug_struct, "payload", &self.payload);
+ ::core::fmt::DebugStruct::finish(&mut debug_struct)
+ }
+ }
+ };
+
#[derive(::core::clone::Clone, ::core::marker::Copy, #crate_name::AnyBitPattern)]
#[repr(C)]
#[allow(non_snake_case)]
@@ -807,13 +824,16 @@
#(#union_fields,)*
}
- #[cfg(not(target_arch = "spirv"))]
- impl ::core::fmt::Debug for #variants_union_ident {
- fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
- let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#variants_union_ident));
- ::core::fmt::DebugStruct::finish_non_exhaustive(&mut debug_struct)
+ #[allow(unexpected_cfgs)]
+ const _: () = {
+ #[cfg(not(target_arch = "spirv"))]
+ impl ::core::fmt::Debug for #variants_union_ident {
+ fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
+ let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#variants_union_ident));
+ ::core::fmt::DebugStruct::finish_non_exhaustive(&mut debug_struct)
+ }
}
- }
+ };
#(#variant_struct_definitions)*
},
@@ -930,14 +950,17 @@
#(#union_fields,)*
}
- #[cfg(not(target_arch = "spirv"))]
- impl ::core::fmt::Debug for #bits_ty_ident {
- fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
- let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#bits_ty_ident));
- ::core::fmt::DebugStruct::field(&mut debug_struct, "tag", unsafe { &self.__tag });
- ::core::fmt::DebugStruct::finish_non_exhaustive(&mut debug_struct)
+ #[allow(unexpected_cfgs)]
+ const _: () = {
+ #[cfg(not(target_arch = "spirv"))]
+ impl ::core::fmt::Debug for #bits_ty_ident {
+ fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
+ let mut debug_struct = ::core::fmt::Formatter::debug_struct(f, ::core::stringify!(#bits_ty_ident));
+ ::core::fmt::DebugStruct::field(&mut debug_struct, "tag", unsafe { &self.__tag });
+ ::core::fmt::DebugStruct::finish_non_exhaustive(&mut debug_struct)
+ }
}
- }
+ };
#(#variant_struct_definitions)*
},
@@ -962,22 +985,20 @@
/// is equal to the sum of the size of it's fields
fn generate_assert_no_padding(input: &DeriveInput) -> Result<TokenStream> {
let struct_type = &input.ident;
- let span = input.ident.span();
let enum_variant = None; // `no padding` check is not supported for `enum`s yet.
let fields = get_fields(input, enum_variant)?;
let mut field_types = get_field_types(&fields);
let size_sum = if let Some(first) = field_types.next() {
- let size_first = quote_spanned!(span => ::core::mem::size_of::<#first>());
- let size_rest =
- quote_spanned!(span => #( + ::core::mem::size_of::<#field_types>() )*);
+ let size_first = quote!(::core::mem::size_of::<#first>());
+ let size_rest = quote!(#( + ::core::mem::size_of::<#field_types>() )*);
- quote_spanned!(span => #size_first #size_rest)
+ quote!(#size_first #size_rest)
} else {
- quote_spanned!(span => 0)
+ quote!(0)
};
- Ok(quote_spanned! {span => const _: fn() = || {
+ Ok(quote! {const _: fn() = || {
#[doc(hidden)]
struct TypeWithoutPadding([u8; #size_sum]);
let _ = ::core::mem::transmute::<#struct_type, TypeWithoutPadding>;
@@ -991,9 +1012,8 @@
let (impl_generics, _ty_generics, where_clause) =
input.generics.split_for_impl();
let fields = get_fields(input, enum_variant)?;
- let span = input.span();
let field_types = get_field_types(&fields);
- Ok(quote_spanned! {span => #(const _: fn() = || {
+ Ok(quote! {#(const _: fn() = || {
#[allow(clippy::missing_const_for_fn)]
#[doc(hidden)]
fn check #impl_generics () #where_clause {
diff --git a/crates/bytemuck_derive/tests/basic.rs b/crates/bytemuck_derive/tests/basic.rs
index 72e471b..daa96d4 100644
--- a/crates/bytemuck_derive/tests/basic.rs
+++ b/crates/bytemuck_derive/tests/basic.rs
@@ -1,4 +1,5 @@
#![allow(dead_code)]
+#![deny(clippy::allow_attributes)]
use bytemuck::{
checked::CheckedCastError, AnyBitPattern, CheckedBitPattern, Contiguous,
diff --git a/crates/predicates-tree/.android-checksum.json b/crates/predicates-tree/.android-checksum.json
index fdcfd04..b44121d 100644
--- a/crates/predicates-tree/.android-checksum.json
+++ b/crates/predicates-tree/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"c15dd2517a91f8f063f015d933cde6285cb836546e0a516252a83af8606228a3","Android.bp":"163fc823a964b9e73afc5cea22420fd8464284382521f66e22f053302fc0325b","Cargo.lock":"793b1124375429034af7b57b58e014050f4ce848fac323d92c7fde8c5cbe363d","Cargo.toml":"b65774d511b288868769cec29cf70e6b05ad92cd3d0f9d81c97f04e224caac5c","LICENSE":"6a823c8069932f07af9f6632e29978de3af2c0d5ea8e71afc621547fb91edc29","LICENSE-APACHE":"6a823c8069932f07af9f6632e29978de3af2c0d5ea8e71afc621547fb91edc29","LICENSE-MIT":"b1d654eef14f674c63e128eacab0111ff6e9defc751341f764957f7947a25a7a","METADATA":"e7083346ada68cff7b0bc42c2716174954278baffd2330dded67ffc1f1a9b565","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"7b68e5c060fa7645281c4bf84bbf64e4605ce9de72966afeb9fb5877d143ca97","cargo_embargo.json":"48b90df621dbf12710f97f8c66bbe1682f5d0a9d4925ec8652ba6c52a7359ce5","examples/failures.rs":"8297001cf523bc4777695b6247cd50d42e7c7c2cc25574d630b56f54cba58374","src/lib.rs":"a999409271bfbde024e1f0e0b88130b295ebe5689e5c7b0ecef8d701825ba6c6"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"25dd3eb062b51cb6370332d71e2df8d6a1a85b3e2c5513d7d779dffc7cfb37f5","Android.bp":"84b5453b4096fa6d39a4a61a792ff5291494597c7f5107fb2f792391b27d24fd","Cargo.lock":"3dd28acf1ea9c6479bddef55c5ab7122a9246e13dc01da707f29a95c160838a8","Cargo.toml":"44e986d52267931eab5b2794a047c7d8f78f5717fe6514289cd789e45c827780","LICENSE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-APACHE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"c51bf0323a728cd6eadea4eef5530fa055e2325ee361d695907f5fecee085001","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"7b68e5c060fa7645281c4bf84bbf64e4605ce9de72966afeb9fb5877d143ca97","cargo_embargo.json":"48b90df621dbf12710f97f8c66bbe1682f5d0a9d4925ec8652ba6c52a7359ce5","examples/failures.rs":"8297001cf523bc4777695b6247cd50d42e7c7c2cc25574d630b56f54cba58374","src/lib.rs":"b2c8586280d84ff534a0cf66e59fd8b13ad0986e2794dcb319c56eefc20edc70"}}
\ No newline at end of file
diff --git a/crates/predicates-tree/.cargo-checksum.json b/crates/predicates-tree/.cargo-checksum.json
index 58007c6..2f1f3cb 100644
--- a/crates/predicates-tree/.cargo-checksum.json
+++ b/crates/predicates-tree/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"00e7615c11a29d07b20354e6c2bbed48a24d226fa137bf3a6953f631b04ccafe","Cargo.toml":"b52f695e84927ad9887c19b0dc5b9a567d3ed28193fd68d682f207c3ccafbdac","LICENSE-APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE-MIT":"9d6bf646112f22f1dd5722fbf615ac184bc372727b615e5dff7e45fe8de3a99e","README.md":"2e96471579f50e44834a5e58f1f16466c0395661873754ac5b8b342ecd157786","examples/failures.rs":"e5c9bafb7649d2b8aad4b585c28385cfc2d55e32aa190da693c920fc61945275","src/lib.rs":"b784e62fc9cd370ce29955e3cbc35ba1456efa0324fb49c0cf705969f691b4ba"},"package":"368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"}
\ No newline at end of file
+{"files":{"Cargo.lock":"f82051c33a7cd8242f458b112faf17e51f4c8e25d7c300092abe630840c6e1d2","Cargo.toml":"6595246d690ca3b947a848aa806366145be709811ed3ae1c467ee006a17c3455","LICENSE-APACHE":"b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"2e96471579f50e44834a5e58f1f16466c0395661873754ac5b8b342ecd157786","examples/failures.rs":"e5c9bafb7649d2b8aad4b585c28385cfc2d55e32aa190da693c920fc61945275","src/lib.rs":"d92dc9f3a6aebe337e152ee535dd034df0d373a50968af914aeb47a0816530e9"},"package":"41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"}
\ No newline at end of file
diff --git a/crates/predicates-tree/Android.bp b/crates/predicates-tree/Android.bp
index 5b11105..2e78628 100644
--- a/crates/predicates-tree/Android.bp
+++ b/crates/predicates-tree/Android.bp
@@ -18,7 +18,7 @@
host_supported: true,
crate_name: "predicates_tree",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.9",
+ cargo_pkg_version: "1.0.11",
crate_root: "src/lib.rs",
edition: "2021",
rustlibs: [
diff --git a/crates/predicates-tree/Cargo.lock b/crates/predicates-tree/Cargo.lock
index 2bae5b1..3ec9853 100644
--- a/crates/predicates-tree/Cargo.lock
+++ b/crates/predicates-tree/Cargo.lock
@@ -4,18 +4,18 @@
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
dependencies = [
"memchr",
]
[[package]]
name = "anstyle"
-version = "0.3.1"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c697cc33851b02ab0c26b2e8a211684fbe627ff1cc506131f35026dd7686dd"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
name = "autocfg"
@@ -30,12 +30,6 @@
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
-name = "either"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
-[[package]]
name = "float-cmp"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -45,15 +39,6 @@
]
[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -67,23 +52,22 @@
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
[[package]]
name = "predicates"
-version = "3.0.1"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed"
+checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
dependencies = [
"anstyle",
"difflib",
"float-cmp",
- "itertools",
"normalize-line-endings",
"predicates-core",
"regex",
@@ -91,13 +75,13 @@
[[package]]
name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
[[package]]
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
dependencies = [
"predicates",
"predicates-core",
@@ -106,9 +90,21 @@
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [
"aho-corasick",
"memchr",
@@ -117,9 +113,9 @@
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "termtree"
diff --git a/crates/predicates-tree/Cargo.toml b/crates/predicates-tree/Cargo.toml
index 4716753..a2ea4c7 100644
--- a/crates/predicates-tree/Cargo.toml
+++ b/crates/predicates-tree/Cargo.toml
@@ -11,10 +11,11 @@
[package]
edition = "2021"
-rust-version = "1.64.0"
+rust-version = "1.74"
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
authors = ["Nick Stevens <[email protected]>"]
+build = false
include = [
"build.rs",
"src/**/*",
@@ -24,6 +25,10 @@
"benches/**/*",
"examples/**/*",
]
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
description = "Render boolean-valued predicate functions results as a tree."
homepage = "https://github.com/assert-rs/predicates-rs/tree/master/crates/tree"
documentation = "https://docs.rs/predicates-tree"
@@ -42,40 +47,55 @@
license = "MIT OR Apache-2.0"
repository = "https://github.com/assert-rs/predicates-rs/tree/master/crates/tree"
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = [
+ "--cfg",
+ "docsrs",
+]
+
[[package.metadata.release.pre-release-replacements]]
file = "CHANGELOG.md"
-search = "Unreleased"
+min = 1
replace = "{{version}}"
-min = 1
+search = "Unreleased"
[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = '\.\.\.HEAD'
-replace = "...{{tag_name}}"
exactly = 1
+file = "CHANGELOG.md"
+replace = "...{{tag_name}}"
+search = '\.\.\.HEAD'
[[package.metadata.release.pre-release-replacements]]
file = "CHANGELOG.md"
-search = "ReleaseDate"
-replace = "{{date}}"
min = 1
+replace = "{{date}}"
+search = "ReleaseDate"
[[package.metadata.release.pre-release-replacements]]
+exactly = 1
file = "CHANGELOG.md"
-search = "<!-- next-header -->"
replace = """
<!-- next-header -->
## [Unreleased] - ReleaseDate
"""
-exactly = 1
+search = "<!-- next-header -->"
[[package.metadata.release.pre-release-replacements]]
+exactly = 1
file = "CHANGELOG.md"
-search = "<!-- next-url -->"
replace = """
<!-- next-url -->
[Unreleased]: https://github.com/assert-rs/predicates-rs/compare/{{tag_name}}...HEAD"""
-exactly = 1
+search = "<!-- next-url -->"
+
+[lib]
+name = "predicates_tree"
+path = "src/lib.rs"
+
+[[example]]
+name = "failures"
+path = "examples/failures.rs"
[dependencies.predicates-core]
version = "1.0"
@@ -84,5 +104,5 @@
version = "0.4.1"
[dev-dependencies.predicates]
-version = "3.0"
+version = "3.1"
features = ["color"]
diff --git a/crates/predicates-tree/LICENSE-APACHE b/crates/predicates-tree/LICENSE-APACHE
index d9a10c0..8dada3e 100644
--- a/crates/predicates-tree/LICENSE-APACHE
+++ b/crates/predicates-tree/LICENSE-APACHE
@@ -174,3 +174,28 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/crates/predicates-tree/LICENSE-MIT b/crates/predicates-tree/LICENSE-MIT
index 51e7743..a2d0108 100644
--- a/crates/predicates-tree/LICENSE-MIT
+++ b/crates/predicates-tree/LICENSE-MIT
@@ -1,7 +1,4 @@
-MIT License
-
-Copyright (c) 2017 Nick Stevens
-
+Copyright (c) Individual contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/crates/predicates-tree/METADATA b/crates/predicates-tree/METADATA
index 195961f..6b2e993 100644
--- a/crates/predicates-tree/METADATA
+++ b/crates/predicates-tree/METADATA
@@ -1,17 +1,17 @@
name: "predicates-tree"
description: "Render boolean-valued predicate functions results as a tree."
third_party {
- version: "1.0.9"
+ version: "1.0.11"
license_type: NOTICE
last_upgrade_date {
- year: 2023
- month: 11
- day: 6
+ year: 2025
+ month: 1
+ day: 14
}
homepage: "https://crates.io/crates/predicates-tree"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.9.crate"
- version: "1.0.9"
+ value: "https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.11.crate"
+ version: "1.0.11"
}
}
diff --git a/crates/predicates-tree/src/lib.rs b/crates/predicates-tree/src/lib.rs
index f0d2fd5..9e5e132 100644
--- a/crates/predicates-tree/src/lib.rs
+++ b/crates/predicates-tree/src/lib.rs
@@ -8,6 +8,8 @@
//! Render `Case` as a tree.
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+
use std::fmt;
use predicates_core::reflection;
diff --git a/crates/predicates/.android-checksum.json b/crates/predicates/.android-checksum.json
index 81c47ad..959c702 100644
--- a/crates/predicates/.android-checksum.json
+++ b/crates/predicates/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"75f5d327bdab6a24f797d5c0b7ee3f479c7e6d3b67dbc71c59b070f6d4eeb382","Android.bp":"a417ede6b22892cf81bfc31f2f02e3d98ac457f639d6aa90bd99f74bfc2e3703","Cargo.lock":"099fbb381f413251f07bcab11276971f1386ee65018ed88c267cae5b942ee211","Cargo.toml":"9ad1a0d7911ffe20611205310a831cf95739a6b73a598cdfff11419a56474660","LICENSE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-APACHE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"049985a8ba0393429148c3f773d3969226ce738753b3c788ed1e951f4d8132cf","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"20a6fc37b5606f9825f7238e4581124053798aa2784ac32e032f3fcecb9096fd","TEST_MAPPING":"2e0949109c21000f8b5e00ba73c5d5c41946c09c8be2a4c740db8b5f94bb9841","cargo_embargo.json":"7e73b6002409ca30476f808ba27af51079f28fb6687ff87fd12f6a3234fa710c","examples/case_tree.rs":"c15168173fa0a6d0336a9f243fa08b09e67e387d4544e511692aa07c65f809a0","patches/use-termcolor.patch":"340ec7d6f503adadbff285749b8d0031d484e4c4b27524b1093147b27fceca81","src/boolean.rs":"105ae52617a44280904f00b1af4fadbe6e15b7ae26b30c6a94b6ffef80fbaf07","src/boxed.rs":"62d04fc53246dd9335b9a97c236cbe75dec3e81d5aeeb270d8efaae9e53e3a7c","src/color.rs":"d8db1b291830e42828962ebf8c88cd13f96399133489500a58b0ae4eb5bf7ff6","src/constant.rs":"728c5b856193518a4cef6cccebfdce88294a466c1bbbd1b5534f5543195ae611","src/float/close.rs":"1ffd7679c2350740ac48ca67ef325672f5a018f9554b7c8c7ffa2e0b92a60244","src/float/mod.rs":"58a5d4429f7ac85a1940dcda0912846ee80c893f2c760a925e8ca73efec0e58a","src/function.rs":"a667f9d404cf2b49b1a14072fd6196e99ac81818c58ff3f777595eaafaa6fe38","src/iter.rs":"9a9bd8c8fb2d9ccc61b7bdb088fd88aafbf4a57fd42e6fbf353ef82c1934b85f","src/lib.rs":"caf39c3857e3a54cba86461835ceaadc903217fc82d90e2c7f1b3a2e2e93c252","src/name.rs":"cab25e7f3a4475591f298f499a9c3cf91e74e359237d42a97b95dcf5aad05322","src/ord.rs":"8148c7aec00c8e7386c86c418f8adf54dce2c2c31ef296e30ccfa6879fad53b4","src/path/existence.rs":"74e6d3874bedb0599c81aa7c6ba7ae19887e868df0fb3913d8affcdd98ed13ca","src/path/fc.rs":"333627069d7cd6c7b91e543d2e82d2116df3f532ebda610bad72391cbe1f20d0","src/path/fs.rs":"cf669d83f99c1d08140b4bfbf0bed3fec6258d4ee4711a0237dc04034db4112f","src/path/ft.rs":"21ccf900fb19f8183e8f9f085291c03bfb5bb6c2a6fad11ab02b6a1141722445","src/path/mod.rs":"a2a3bd146f54c326496195dbfe2b81beb22bcaba72cce9584209a829e232f40c","src/prelude.rs":"226cb65500d6caa522bc6c306dd2880d2e4a27356af58b261aec24629635fd59","src/str/adapters.rs":"d2079d2b554e13b3a782a76176da7f2cfb600dc6c17b7c7debbdc844b6342e61","src/str/basics.rs":"c687ed3b2abdf1d9c9cc2b311d36930b6048d6d94c46f8bac8b059dba36853f0","src/str/difference.rs":"5ec4de1427e7dfd611505c3f8ca6ec6532243b8e8a9ed3eb5543395c7b896b6b","src/str/mod.rs":"70749134087ca455d7245f52e6c3e06d8f568ed4eaa5360e60466721f856e57d","src/str/normalize.rs":"4bd8f18e89e6d1e8b478bd49b04d025cf4a9360859ae0a560c8d39330044ac8b","src/str/regex.rs":"5c1d3d87439895b91c4b9bbf4fe17476ea917d82725df4da7518648bfa3dc289","src/utils.rs":"77759cbd63d08f2d051627fd06c8e28a8bc17b12b76cbf55c5fd581ac8fd28fe"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"d7240a2d1fbdae0d29c842faa0350207fc758f29281408b9d0013683a940e5e6","Android.bp":"c21cb62ed06e6dd0a9d6eca8f8c0dca2121f3a5ca5e5ef2d217a473e8638f087","Cargo.lock":"d905383188657501e9139be84bea076f2e974d108e3e105a32b35e7e4b299512","Cargo.toml":"8b1465c633eed0264067edd63339022207af03846b63cdfd1387dc540b7f1044","LICENSE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-APACHE":"90364369fcd32608226545dbeeff4401827c7305eabe4a022046cc03d078c9e9","LICENSE-MIT":"538f704e6bc384de6dd775d81e9df89f9d718f0e2808a24a789eaa03beb129d3","METADATA":"e7aeb0f2a9fa9b979810b71dc112320c6ab730b86be53770254dce9113ec3918","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"cc46fc7977547eb092744a45114f295809af5f7df592816f480dd3ee85e0d660","TEST_MAPPING":"2e0949109c21000f8b5e00ba73c5d5c41946c09c8be2a4c740db8b5f94bb9841","cargo_embargo.json":"7e73b6002409ca30476f808ba27af51079f28fb6687ff87fd12f6a3234fa710c","examples/case_tree.rs":"f82d58810760771b7d9d79e9cc9f9cd48fadbfacd22e27d034f84c2b60bebbbc","patches/use-termcolor.patch":"340ec7d6f503adadbff285749b8d0031d484e4c4b27524b1093147b27fceca81","src/boolean.rs":"105ae52617a44280904f00b1af4fadbe6e15b7ae26b30c6a94b6ffef80fbaf07","src/boxed.rs":"81c6a18660040c3f81b8f9ca683d0cdc15e5e4ada721293ce3fe72ca218f98ab","src/color.rs":"d8db1b291830e42828962ebf8c88cd13f96399133489500a58b0ae4eb5bf7ff6","src/constant.rs":"728c5b856193518a4cef6cccebfdce88294a466c1bbbd1b5534f5543195ae611","src/float/close.rs":"5ac8f92160d5f56892c270f19aa5ee723cad908e1006016c602479d10451581b","src/float/mod.rs":"58a5d4429f7ac85a1940dcda0912846ee80c893f2c760a925e8ca73efec0e58a","src/function.rs":"a667f9d404cf2b49b1a14072fd6196e99ac81818c58ff3f777595eaafaa6fe38","src/iter.rs":"9a9bd8c8fb2d9ccc61b7bdb088fd88aafbf4a57fd42e6fbf353ef82c1934b85f","src/lib.rs":"1c4aa0bdbfeb6802708c2376d956613477222d539bafdf47f1d3aca358e862d8","src/name.rs":"cab25e7f3a4475591f298f499a9c3cf91e74e359237d42a97b95dcf5aad05322","src/ord.rs":"0093ed70310d376b481eb2a2fefdd238887566501b5b7fcdf8fd7b5a99fd4545","src/path/existence.rs":"74e6d3874bedb0599c81aa7c6ba7ae19887e868df0fb3913d8affcdd98ed13ca","src/path/fc.rs":"333627069d7cd6c7b91e543d2e82d2116df3f532ebda610bad72391cbe1f20d0","src/path/fs.rs":"cf669d83f99c1d08140b4bfbf0bed3fec6258d4ee4711a0237dc04034db4112f","src/path/ft.rs":"5675e6315f745dc7c11e71165a33159eceaac77dcbe80f2cc71512ba4b6316b6","src/path/mod.rs":"a2a3bd146f54c326496195dbfe2b81beb22bcaba72cce9584209a829e232f40c","src/prelude.rs":"226cb65500d6caa522bc6c306dd2880d2e4a27356af58b261aec24629635fd59","src/str/adapters.rs":"839b0513f2a2fd2fd4ae1450b1ed48002004a6d7701db5f18b7638325403b878","src/str/basics.rs":"c687ed3b2abdf1d9c9cc2b311d36930b6048d6d94c46f8bac8b059dba36853f0","src/str/difference.rs":"0abf2965c9c85571bcdafd2072db105888a77667336ca8f8258562faf4db0adb","src/str/mod.rs":"70749134087ca455d7245f52e6c3e06d8f568ed4eaa5360e60466721f856e57d","src/str/normalize.rs":"4bd8f18e89e6d1e8b478bd49b04d025cf4a9360859ae0a560c8d39330044ac8b","src/str/regex.rs":"5c1d3d87439895b91c4b9bbf4fe17476ea917d82725df4da7518648bfa3dc289","src/utils.rs":"256f94dac650c2977180e45a9cb70dee1f288dcc3e5232b0b7ab1dfb5093dd28"}}
\ No newline at end of file
diff --git a/crates/predicates/.cargo-checksum.json b/crates/predicates/.cargo-checksum.json
index 601663d..5edfbc0 100644
--- a/crates/predicates/.cargo-checksum.json
+++ b/crates/predicates/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"c2c5eddcead91015990f79e6ef2af02ee6b52db0cf37bb03d52d8ba723f346a5","Cargo.toml":"4e015575e7946b4af1df402a2e830001eb030f38ab6284e78db76c4dcfe64f12","LICENSE-APACHE":"b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"8f6005f96abf793f1c5221dd6792f2a3104f0ed4ca3fdf96988f999da7103f90","examples/case_tree.rs":"61f3d638d507399c4e286353989331773e30221b6ed624b946167353e6f59921","src/boolean.rs":"2aab95ec45891adabd46dfd0c507febb8f79348ac33776fb75b6fc5e88738f68","src/boxed.rs":"fc004780b79611076610b33467976f24de2b5dba419422274b8d5674a3281c24","src/color.rs":"3be07503bcd6631275b9e7ef00919175141c7cb88a40d689d01e6f26f376c578","src/constant.rs":"b3c9651948525e9aa5679e14e886117143f4fb9cabbb0fb5b66411de79856867","src/float/close.rs":"1d98601d755f25da36a5ddd70c3bf31f33612ab47dd4a6f6d86a4e81f58732e9","src/float/mod.rs":"e12150122e36b4c508f6668391c9c89adcd7f9b396fc1f4cdab1457355bf933c","src/function.rs":"560e08927a12875fe7c4b4b71a45d659ec518b4af149d98d4ff19bedf118af9c","src/iter.rs":"4a3dac9de86efe929e18dff6dd0b08a8cb2e214944a43cabc1d908a129909c0f","src/lib.rs":"8aff180adc2a83eab173a74662f469215b90a216d3bca942416a0202ed3ee608","src/name.rs":"44d66b3dde5a436dece16fdc71ae5c1cc3ede2d3599b088c057629c51744bf3f","src/ord.rs":"f4beb692fc169ef09ebc275acfc7c646dfc3bbcf92f426a6fde5f2d5acc8c733","src/path/existence.rs":"4414b209473ad275675b8cddaab70cc306a264f226ad68670a3956e511d8a59a","src/path/fc.rs":"90d38b7e63e28d669f83c0e0c39b04ff020609312ded2b8d17d307116d6823b5","src/path/fs.rs":"fc4d83e2e938826d5f93f9ba335a36c5086d00e93c7086ae65c3c5433752fe3d","src/path/ft.rs":"55492d5eb81fd1a91e0ea33b88b071dee6f82cd48d3900aa875bd66d6381ac8d","src/path/mod.rs":"8b57b16bcc36c3f7fc02ab9e5900ec2fbce75f9b32d9231e304674b958590646","src/prelude.rs":"d808bec934efbe70de122cbd563007098d236fe201868e8bccea73995405a029","src/str/adapters.rs":"f323f64f2570e36c466be3ef161ddb53015ede0261f4d5689b238c8431374d3e","src/str/basics.rs":"f22c5db34012a605780398a87a7fa6c6c3403afd2cec0c3f57504f2f8dee9fb4","src/str/difference.rs":"3a991fdb39e6c3387ab4592ab7c4108d858b92eb3d2f157b23ccaa295c265ff7","src/str/mod.rs":"c810c38a1f85dfd051cee30c4020a5748ae547f8f906459a5e9ef3f322a60870","src/str/normalize.rs":"97c42c49922d4550486831d88d3cfb6e1ab5af6176615e7b46646f2f7e7785b8","src/str/regex.rs":"1f72ed3f614bc8852bfcc9c7c790202cd305f802ceb99b62c90fba197880b9c9","src/utils.rs":"077b8f6ee9da4afb5c183d08a2bbba33cda810525424523ec77d586390dcf2f2"},"package":"6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0"}
\ No newline at end of file
+{"files":{"Cargo.lock":"a2a92a46c4fe9ced17109fa6541369ed9ad6d3f426ff3d8ba0649d31b4995b2c","Cargo.toml":"98c284bc60c87caeb891c4a046c2495a13ad8c9fc8138cab4744973a1843aa56","LICENSE-APACHE":"b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1","LICENSE-MIT":"6efb0476a1cc085077ed49357026d8c173bf33017278ef440f222fb9cbcb66e6","README.md":"016703be2b9d4e506ddc78f10df70a7765ddf2f8c42bc230fc37346bd15b217b","examples/case_tree.rs":"65a20067977ef6ed745554ac8914c93b2b6c67d5d736ac292725d564d1e0e71c","src/boolean.rs":"2aab95ec45891adabd46dfd0c507febb8f79348ac33776fb75b6fc5e88738f68","src/boxed.rs":"0a542664f99d182481ff9ef5805e7659689db257debed59e4ce8b0946f930061","src/color.rs":"3be07503bcd6631275b9e7ef00919175141c7cb88a40d689d01e6f26f376c578","src/constant.rs":"b3c9651948525e9aa5679e14e886117143f4fb9cabbb0fb5b66411de79856867","src/float/close.rs":"c176e80091a8394145ea7ba1ee23e6e98845db4c0ca0262ab5f69bd815b85180","src/float/mod.rs":"e12150122e36b4c508f6668391c9c89adcd7f9b396fc1f4cdab1457355bf933c","src/function.rs":"560e08927a12875fe7c4b4b71a45d659ec518b4af149d98d4ff19bedf118af9c","src/iter.rs":"4a3dac9de86efe929e18dff6dd0b08a8cb2e214944a43cabc1d908a129909c0f","src/lib.rs":"aab83cd765746d20180261ae15682af768e6ccb1301f66f78459e7b75905a251","src/name.rs":"44d66b3dde5a436dece16fdc71ae5c1cc3ede2d3599b088c057629c51744bf3f","src/ord.rs":"6f06ee867a17227afff7c5d604565ea86010c3c3997972ae3e5780c652d6d834","src/path/existence.rs":"4414b209473ad275675b8cddaab70cc306a264f226ad68670a3956e511d8a59a","src/path/fc.rs":"90d38b7e63e28d669f83c0e0c39b04ff020609312ded2b8d17d307116d6823b5","src/path/fs.rs":"fc4d83e2e938826d5f93f9ba335a36c5086d00e93c7086ae65c3c5433752fe3d","src/path/ft.rs":"69b4785928a998b8e16bea60259aded218efbc275f04ec5cbd334d7e3e5ef070","src/path/mod.rs":"8b57b16bcc36c3f7fc02ab9e5900ec2fbce75f9b32d9231e304674b958590646","src/prelude.rs":"d808bec934efbe70de122cbd563007098d236fe201868e8bccea73995405a029","src/str/adapters.rs":"4b98c1e566753ba54eff771c732e65ff28fcb197adf7e9e289dc336cf0a7117f","src/str/basics.rs":"f22c5db34012a605780398a87a7fa6c6c3403afd2cec0c3f57504f2f8dee9fb4","src/str/difference.rs":"5a3afbaa03529365d0e32864577e467e99f292d07b8ffb447e90878b5d3b5b37","src/str/mod.rs":"c810c38a1f85dfd051cee30c4020a5748ae547f8f906459a5e9ef3f322a60870","src/str/normalize.rs":"97c42c49922d4550486831d88d3cfb6e1ab5af6176615e7b46646f2f7e7785b8","src/str/regex.rs":"1f72ed3f614bc8852bfcc9c7c790202cd305f802ceb99b62c90fba197880b9c9","src/utils.rs":"94f675eb891de17c2eb32f7c980baa6506af8e43f1cf5af24f91c1b6d54a1a75"},"package":"a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"}
\ No newline at end of file
diff --git a/crates/predicates/Android.bp b/crates/predicates/Android.bp
index 0e21644..5cdc9c5 100644
--- a/crates/predicates/Android.bp
+++ b/crates/predicates/Android.bp
@@ -18,7 +18,7 @@
host_supported: true,
crate_name: "predicates",
cargo_env_compat: true,
- cargo_pkg_version: "3.0.4",
+ cargo_pkg_version: "3.1.3",
crate_root: "src/lib.rs",
edition: "2021",
features: [
@@ -26,7 +26,6 @@
"regex",
],
rustlibs: [
- "libitertools",
"libpredicates_core",
"libregex",
"libtermcolor",
@@ -45,7 +44,7 @@
host_supported: true,
crate_name: "predicates",
cargo_env_compat: true,
- cargo_pkg_version: "3.0.4",
+ cargo_pkg_version: "3.1.3",
crate_root: "src/lib.rs",
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -58,7 +57,6 @@
"regex",
],
rustlibs: [
- "libitertools",
"libpredicates_core",
"libpredicates_tree",
"libregex",
diff --git a/crates/predicates/Cargo.lock b/crates/predicates/Cargo.lock
index 078e0b0..71ad3b3 100644
--- a/crates/predicates/Cargo.lock
+++ b/crates/predicates/Cargo.lock
@@ -30,30 +30,15 @@
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-[[package]]
name = "float-cmp"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8"
dependencies = [
"num-traits",
]
[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -76,12 +61,11 @@
[[package]]
name = "predicates"
-version = "3.0.4"
+version = "3.1.3"
dependencies = [
"anstyle",
"difflib",
"float-cmp",
- "itertools",
"normalize-line-endings",
"predicates-core",
"predicates-tree",
@@ -90,15 +74,15 @@
[[package]]
name = "predicates-core"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
[[package]]
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
dependencies = [
"predicates-core",
"termtree",
diff --git a/crates/predicates/Cargo.toml b/crates/predicates/Cargo.toml
index a679840..77234d8 100644
--- a/crates/predicates/Cargo.toml
+++ b/crates/predicates/Cargo.toml
@@ -11,10 +11,11 @@
[package]
edition = "2021"
-rust-version = "1.69.0"
+rust-version = "1.74"
name = "predicates"
-version = "3.0.4"
+version = "3.1.3"
authors = ["Nick Stevens <[email protected]>"]
+build = false
include = [
"build.rs",
"src/**/*",
@@ -24,6 +25,11 @@
"benches/**/*",
"examples/**/*",
]
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
description = "An implementation of boolean-valued predicate functions."
homepage = "https://github.com/assert-rs/predicates-rs"
documentation = "https://docs.rs/predicates"
@@ -47,19 +53,20 @@
rustdoc-args = [
"--cfg",
"docsrs",
+ "--generate-link-to-definition",
]
[[package.metadata.release.pre-release-replacements]]
exactly = 1
file = "src/lib.rs"
-replace = "predicates = \"{{version}}\""
-search = "predicates = \".*\""
+replace = 'predicates = "{{version}}"'
+search = 'predicates = ".*"'
[[package.metadata.release.pre-release-replacements]]
exactly = 1
file = "README.md"
-replace = "predicates = \"{{version}}\""
-search = "predicates = \".*\""
+replace = 'predicates = "{{version}}"'
+search = 'predicates = ".*"'
[[package.metadata.release.pre-release-replacements]]
file = "CHANGELOG.md"
@@ -96,17 +103,34 @@
[Unreleased]: https://github.com/assert-rs/predicates-rs/compare/{{tag_name}}...HEAD"""
search = "<!-- next-url -->"
+[features]
+color = []
+default = [
+ "diff",
+ "regex",
+ "float-cmp",
+ "normalize-line-endings",
+ "color",
+]
+diff = ["dep:difflib"]
+unstable = []
+
+[lib]
+name = "predicates"
+path = "src/lib.rs"
+
+[[example]]
+name = "case_tree"
+path = "examples/case_tree.rs"
+
[dependencies.difflib]
version = "0.4"
optional = true
[dependencies.float-cmp]
-version = "0.9"
+version = "0.10"
optional = true
-[dependencies.itertools]
-version = "0.11"
-
[dependencies.normalize-line-endings]
version = "0.3.0"
optional = true
@@ -124,14 +148,74 @@
[dev-dependencies.predicates-tree]
version = "1.0"
-[features]
-color = []
-default = [
- "diff",
- "regex",
- "float-cmp",
- "normalize-line-endings",
- "color",
-]
-diff = ["dep:difflib"]
-unstable = []
+[lints.clippy]
+bool_assert_comparison = "allow"
+branches_sharing_code = "allow"
+checked_conversions = "warn"
+collapsible_else_if = "allow"
+create_dir = "warn"
+dbg_macro = "warn"
+debug_assert_with_mut_call = "warn"
+doc_markdown = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+expl_impl_clone_on_copy = "warn"
+explicit_deref_methods = "warn"
+explicit_into_iter_loop = "warn"
+fallible_impl_from = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+float_cmp_const = "warn"
+fn_params_excessive_bools = "warn"
+from_iter_instead_of_collect = "warn"
+if_same_then_else = "allow"
+implicit_clone = "warn"
+imprecise_flops = "warn"
+inconsistent_struct_constructor = "warn"
+inefficient_to_string = "warn"
+infinite_loop = "warn"
+invalid_upcast_comparisons = "warn"
+large_digit_groups = "warn"
+large_stack_arrays = "warn"
+large_types_passed_by_value = "warn"
+let_and_return = "allow"
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+mem_forget = "warn"
+mutex_integer = "warn"
+needless_continue = "warn"
+needless_for_each = "warn"
+negative_feature_names = "warn"
+path_buf_push_overwrite = "warn"
+ptr_as_ptr = "warn"
+rc_mutex = "warn"
+redundant_feature_names = "warn"
+ref_option_ref = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+result_large_err = "allow"
+same_functions_in_if_condition = "warn"
+self_named_module_files = "warn"
+semicolon_if_nothing_returned = "warn"
+str_to_string = "warn"
+string_add = "warn"
+string_add_assign = "warn"
+string_lit_as_bytes = "warn"
+string_to_string = "warn"
+todo = "warn"
+trait_duplication_in_bounds = "warn"
+uninlined_format_args = "warn"
+verbose_file_reads = "warn"
+wildcard_imports = "warn"
+zero_sized_map_values = "warn"
+
+[lints.rust]
+unreachable_pub = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+unused_lifetimes = "warn"
+unused_macro_rules = "warn"
+unused_qualifications = "warn"
+
+[lints.rust.rust_2018_idioms]
+level = "warn"
+priority = -1
diff --git a/crates/predicates/METADATA b/crates/predicates/METADATA
index 2788990..1323177 100644
--- a/crates/predicates/METADATA
+++ b/crates/predicates/METADATA
@@ -1,17 +1,17 @@
name: "predicates"
description: "An implementation of boolean-valued predicate functions."
third_party {
- version: "3.0.4"
+ version: "3.1.3"
license_type: NOTICE
last_upgrade_date {
- year: 2023
- month: 11
- day: 6
+ year: 2025
+ month: 1
+ day: 14
}
homepage: "https://crates.io/crates/predicates"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/predicates/predicates-3.0.4.crate"
- version: "3.0.4"
+ value: "https://static.crates.io/crates/predicates/predicates-3.1.3.crate"
+ version: "3.1.3"
}
}
diff --git a/crates/predicates/README.md b/crates/predicates/README.md
index b7d0118..575dc0d 100644
--- a/crates/predicates/README.md
+++ b/crates/predicates/README.md
@@ -15,7 +15,7 @@
```toml
[dependencies]
-predicates = "3.0.4"
+predicates = "3.1.3"
```
Next, add this to your crate:
@@ -29,14 +29,13 @@
For more information on using predicates, look at the
[documentation](https://docs.rs/predicates)
-
## License
`predicates-rs` is distributed under the terms of both the MIT license and the
Apache License (Version 2.0).
-See LICENSE-APACHE, and LICENSE-MIT for details.
-
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
## Credits
diff --git a/crates/predicates/examples/case_tree.rs b/crates/predicates/examples/case_tree.rs
index f9c75dc..6599117 100644
--- a/crates/predicates/examples/case_tree.rs
+++ b/crates/predicates/examples/case_tree.rs
@@ -7,7 +7,7 @@
let var = 5;
let case = pred.find_case(true, &var);
if let Some(case) = case {
- println!("var is {}", var);
+ println!("var is {var}");
println!("{}", case.tree());
}
}
diff --git a/crates/predicates/src/boxed.rs b/crates/predicates/src/boxed.rs
index d64e204..2b96e0c 100644
--- a/crates/predicates/src/boxed.rs
+++ b/crates/predicates/src/boxed.rs
@@ -25,9 +25,9 @@
{
/// Creates a new `BoxPredicate`, a wrapper around a dynamically-dispatched
/// `Predicate` type with useful trait impls.
- pub fn new<P: Predicate<Item>>(inner: P) -> BoxPredicate<Item>
+ pub fn new<P>(inner: P) -> BoxPredicate<Item>
where
- P: Send + Sync + 'static,
+ P: Predicate<Item> + Send + Sync + 'static,
{
BoxPredicate(Box::new(inner))
}
@@ -84,7 +84,7 @@
{
/// Returns a `BoxPredicate` wrapper around this `Predicate` type.
///
- /// Returns a `BoxPredicate` wrapper around this `Predicate type. The
+ /// Returns a `BoxPredicate` wrapper around this `Predicate` type. The
/// `BoxPredicate` type has a number of useful properties:
///
/// - It stores the inner predicate as a trait object, so the type of
@@ -114,4 +114,15 @@
}
}
-impl<P, Item> PredicateBoxExt<Item> for P where P: Predicate<Item> {}
+impl<P, Item: ?Sized> PredicateBoxExt<Item> for P where P: Predicate<Item> {}
+
+#[cfg(test)]
+mod test {
+ use crate::prelude::*;
+
+ #[test]
+ fn unsized_boxed() {
+ let p = predicate::always().boxed();
+ p.eval("4");
+ }
+}
diff --git a/crates/predicates/src/float/close.rs b/crates/predicates/src/float/close.rs
index e642eab..b216ac7 100644
--- a/crates/predicates/src/float/close.rs
+++ b/crates/predicates/src/float/close.rs
@@ -40,7 +40,7 @@
/// let predicate_fn = predicate::float::is_close(a).distance(5);
/// ```
pub fn distance(mut self, distance: <f64 as Ulps>::U) -> Self {
- self.epsilon = (distance as f64) * ::std::f64::EPSILON;
+ self.epsilon = (distance as f64) * f64::EPSILON;
self.ulps = distance;
self
}
@@ -56,7 +56,7 @@
/// use predicates::prelude::*;
///
/// let a = 0.15_f64 + 0.15_f64 + 0.15_f64;
- /// let predicate_fn = predicate::float::is_close(a).epsilon(5.0 * ::std::f64::EPSILON);
+ /// let predicate_fn = predicate::float::is_close(a).epsilon(5.0 * f64::EPSILON);
/// ```
pub fn epsilon(mut self, epsilon: f64) -> Self {
self.epsilon = epsilon;
@@ -152,7 +152,7 @@
pub fn is_close(target: f64) -> IsClosePredicate {
IsClosePredicate {
target,
- epsilon: 2.0 * ::std::f64::EPSILON,
+ epsilon: 2.0 * f64::EPSILON,
ulps: 2,
}
}
diff --git a/crates/predicates/src/lib.rs b/crates/predicates/src/lib.rs
index f2a1f9e..2c9b19b 100644
--- a/crates/predicates/src/lib.rs
+++ b/crates/predicates/src/lib.rs
@@ -24,7 +24,7 @@
//!
//! ```toml
//! [dependencies]
-//! predicates = "3.0.4"
+//! predicates = "3.1.3"
//! ```
//!
//! A [prelude] is available to bring in all extension traits as well as providing
@@ -198,8 +198,10 @@
//! [`str_pred.normalize`]: prelude::PredicateStrExt::normalize()
//! [`str_pred.trim`]: prelude::PredicateStrExt::trim()
-#![warn(missing_docs, missing_debug_implementations)]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![warn(missing_docs)]
+#![warn(clippy::print_stderr)]
+#![warn(clippy::print_stdout)]
pub mod prelude;
diff --git a/crates/predicates/src/ord.rs b/crates/predicates/src/ord.rs
index 1a78c8d..4c2305c 100644
--- a/crates/predicates/src/ord.rs
+++ b/crates/predicates/src/ord.rs
@@ -26,7 +26,7 @@
EqOps::Equal => "==",
EqOps::NotEqual => "!=",
};
- write!(f, "{}", op)
+ write!(f, "{op}")
}
}
@@ -148,7 +148,7 @@
OrdOps::GreaterThanOrEqual => ">=",
OrdOps::GreaterThan => ">",
};
- write!(f, "{}", op)
+ write!(f, "{op}")
}
}
diff --git a/crates/predicates/src/path/ft.rs b/crates/predicates/src/path/ft.rs
index aceed55..eec09f7 100644
--- a/crates/predicates/src/path/ft.rs
+++ b/crates/predicates/src/path/ft.rs
@@ -54,7 +54,7 @@
FileType::Dir => "dir",
FileType::Symlink => "symlink",
};
- write!(f, "{}", t)
+ write!(f, "{t}")
}
}
diff --git a/crates/predicates/src/str/adapters.rs b/crates/predicates/src/str/adapters.rs
index 8ecd848..96856bc 100644
--- a/crates/predicates/src/str/adapters.rs
+++ b/crates/predicates/src/str/adapters.rs
@@ -15,7 +15,7 @@
use crate::str::normalize::NormalizedPredicate;
use crate::Predicate;
-/// Predicate adaper that trims the variable being tested.
+/// Predicate adapter that trims the variable being tested.
///
/// This is created by `pred.trim()`.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -58,7 +58,7 @@
}
}
-/// Predicate adaper that converts a `str` predicate to byte predicate.
+/// Predicate adapter that converts a `str` predicate to byte predicate.
///
/// This is created by `pred.from_utf8()`.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
diff --git a/crates/predicates/src/str/difference.rs b/crates/predicates/src/str/difference.rs
index 6c4de21..0a362dc 100644
--- a/crates/predicates/src/str/difference.rs
+++ b/crates/predicates/src/str/difference.rs
@@ -31,8 +31,8 @@
None
} else {
let palette = crate::Palette::new(true);
- let orig: Vec<_> = self.orig.lines().map(|l| format!("{}\n", l)).collect();
- let variable: Vec<_> = variable.lines().map(|l| format!("{}\n", l)).collect();
+ let orig: Vec<_> = self.orig.lines().map(|l| format!("{l}\n")).collect();
+ let variable: Vec<_> = variable.lines().map(|l| format!("{l}\n")).collect();
let diff = difflib::unified_diff(
&orig,
&variable,
@@ -46,10 +46,8 @@
diff.insert(0, "\n".to_owned());
Some(
- reflection::Case::new(Some(self), result).add_product(reflection::Product::new(
- "diff",
- itertools::join(diff.iter(), ""),
- )),
+ reflection::Case::new(Some(self), result)
+ .add_product(reflection::Product::new("diff", diff.join(""))),
)
}
}
diff --git a/crates/predicates/src/utils.rs b/crates/predicates/src/utils.rs
index 023c545..121f757 100644
--- a/crates/predicates/src/utils.rs
+++ b/crates/predicates/src/utils.rs
@@ -23,7 +23,7 @@
where
T: fmt::Debug,
{
- pub fn new(debug: T) -> Self {
+ pub(crate) fn new(debug: T) -> Self {
Self { debug }
}
}
diff --git a/crates/url/.android-checksum.json b/crates/url/.android-checksum.json
index 4909838..6b925bc 100644
--- a/crates/url/.android-checksum.json
+++ b/crates/url/.android-checksum.json
@@ -1 +1 @@
-{"package":null,"files":{".cargo-checksum.json":"0a9e9b63a282327b18f0f5eb847c4a7da101273ca72cdcfc72fd17e7d014b873","Android.bp":"0018fa9a595b042a19ffba2afd0f7af59237e99780057b0c307f2d2aeb1d2510","Cargo.toml":"4cbdf93133a4742e5bc045b451df6d4000f7ba1d5e72a7df2dbd6e94457fe7c3","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"deddd7dd9f80ec3543c05774ad3a5658e2f6b7cb55453e09d3131325589624f7","METADATA":"d023b3057b739c0f0bc11e0bf219d9669351507b05ba61c983771635080a634a","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"56778957be598e54c0deb26344d2e1436fbfcdc6f11c97dbb8026f8752e45331","TEST_MAPPING":"a2bb7cbc14986cf9c9fa3970683f5f9b2dbb974ad3e385162bc51df051887294","cargo_embargo.json":"18240e8ad1b44847f352e7fdf9ed13a5290db11959ed4f96ca6b549ae7d6c44c","src/host.rs":"64d68badf67b9b74b9d539168269ff3740b202302a9b2b6c91c392e42c7b4ca5","src/lib.rs":"82a1f70c485ce12ee0ff905f2e5060e29a7f902fce74f90e242b7bd8b463f68c","src/origin.rs":"dda7752ffdfceacf2e88dfa7d8e32723f90d8e118ce9c2ea4135b8d7e7db5caf","src/parser.rs":"921c34e9e7142c96589f0d23e3551cd4272dbb6f49ef54e47118267563cef580","src/path_segments.rs":"9354b137626fa9a0f5acfc665bc56bde6b56756ed3f5d5934e20f2bdf39ac017","src/quirks.rs":"8059aa0f782dd12dc2996aa0c6e081ddf7eb16fee8797f465802e96814b1fe67","src/slicing.rs":"f214d74f637a8bbff60f6e1be4225c5374f4254ed115d9eb34d130ca546e23a3","tests/expected_failures.txt":"3e2090342a0b1e22359e960a0e12d3777a2587bfe0870d26804e072fc7a3642a","tests/setters_tests.json":"0b29bb14bf75046a697f7ff018b57e64c39210c7c4e85a5a1874483f5519d3f4","tests/unit.rs":"cd57e15637f38016581bcc1eb606e63dd1cc4c5ab7801b2a6cba94ede7442ddd","tests/urltestdata.json":"3e2f00e307d2679fe7b85f5be0d56b7df78a2894d3514334ae53498c8b33bc52","tests/wpt.rs":"600d579e666fd265cae7ddea3a58d0aa68a48139c52df5d6139a992c146c45b5"}}
\ No newline at end of file
+{"package":null,"files":{".cargo-checksum.json":"0a9e9b63a282327b18f0f5eb847c4a7da101273ca72cdcfc72fd17e7d014b873","Android.bp":"0018fa9a595b042a19ffba2afd0f7af59237e99780057b0c307f2d2aeb1d2510","Cargo.toml":"4cbdf93133a4742e5bc045b451df6d4000f7ba1d5e72a7df2dbd6e94457fe7c3","LICENSE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-APACHE":"3c7cd2396b5b772507febd2615d3d5a55b80103845037df77c87ba6e64872f2c","LICENSE-MIT":"deddd7dd9f80ec3543c05774ad3a5658e2f6b7cb55453e09d3131325589624f7","METADATA":"d023b3057b739c0f0bc11e0bf219d9669351507b05ba61c983771635080a634a","MODULE_LICENSE_APACHE2":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a","README.md":"56778957be598e54c0deb26344d2e1436fbfcdc6f11c97dbb8026f8752e45331","TEST_MAPPING":"254b0924fbe7abd87552e3ef8197e3d49ff221b1ab0a49892dcf4cf4c96c070a","cargo_embargo.json":"18240e8ad1b44847f352e7fdf9ed13a5290db11959ed4f96ca6b549ae7d6c44c","src/host.rs":"64d68badf67b9b74b9d539168269ff3740b202302a9b2b6c91c392e42c7b4ca5","src/lib.rs":"82a1f70c485ce12ee0ff905f2e5060e29a7f902fce74f90e242b7bd8b463f68c","src/origin.rs":"dda7752ffdfceacf2e88dfa7d8e32723f90d8e118ce9c2ea4135b8d7e7db5caf","src/parser.rs":"921c34e9e7142c96589f0d23e3551cd4272dbb6f49ef54e47118267563cef580","src/path_segments.rs":"9354b137626fa9a0f5acfc665bc56bde6b56756ed3f5d5934e20f2bdf39ac017","src/quirks.rs":"8059aa0f782dd12dc2996aa0c6e081ddf7eb16fee8797f465802e96814b1fe67","src/slicing.rs":"f214d74f637a8bbff60f6e1be4225c5374f4254ed115d9eb34d130ca546e23a3","tests/expected_failures.txt":"3e2090342a0b1e22359e960a0e12d3777a2587bfe0870d26804e072fc7a3642a","tests/setters_tests.json":"0b29bb14bf75046a697f7ff018b57e64c39210c7c4e85a5a1874483f5519d3f4","tests/unit.rs":"cd57e15637f38016581bcc1eb606e63dd1cc4c5ab7801b2a6cba94ede7442ddd","tests/urltestdata.json":"3e2f00e307d2679fe7b85f5be0d56b7df78a2894d3514334ae53498c8b33bc52","tests/wpt.rs":"600d579e666fd265cae7ddea3a58d0aa68a48139c52df5d6139a992c146c45b5"}}
\ No newline at end of file
diff --git a/crates/url/TEST_MAPPING b/crates/url/TEST_MAPPING
index c6bc74c..f897dff 100644
--- a/crates/url/TEST_MAPPING
+++ b/crates/url/TEST_MAPPING
@@ -9,7 +9,7 @@
],
"presubmit": [
{
- "name": "url_test_tests_data"
+ "name": "url_test_src_lib"
},
{
"name": "url_test_tests_unit"
@@ -17,7 +17,7 @@
],
"presubmit-rust": [
{
- "name": "url_test_tests_data"
+ "name": "url_test_src_lib"
},
{
"name": "url_test_tests_unit"
diff --git a/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index d47d3d4..984e54a 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -997,9 +997,9 @@
[[package]]
name = "bytemuck_derive"
-version = "1.8.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
+checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
dependencies = [
"proc-macro2 1.0.93",
"quote 1.0.38",
@@ -1967,9 +1967,9 @@
[[package]]
name = "float-cmp"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8"
dependencies = [
"num-traits",
]
@@ -2740,15 +2740,6 @@
[[package]]
name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
@@ -4053,14 +4044,13 @@
[[package]]
name = "predicates"
-version = "3.0.4"
+version = "3.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0"
+checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
dependencies = [
"anstyle",
"difflib",
"float-cmp",
- "itertools 0.11.0",
"normalize-line-endings",
"predicates-core",
"regex",
@@ -4074,9 +4064,9 @@
[[package]]
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
dependencies = [
"predicates-core",
"termtree",
diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 308ed73..e24e8f0 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -42,7 +42,7 @@
bstr = "=1.3.0"
buddy_system_allocator = "=0.11.0"
bytemuck = "=1.21.0"
-bytemuck_derive = "=1.8.0"
+bytemuck_derive = "=1.8.1"
byteorder = "=1.5.0"
bytes = "=1.9.0"
camino = "=1.1.9"
@@ -250,9 +250,9 @@
plotters-svg = "=0.3.7"
poll_token_derive = "=0.1.0"
ppv-lite86 = "=0.2.17"
-predicates = "=3.0.4"
+predicates = "=3.1.3"
predicates-core = "=1.0.9"
-predicates-tree = "=1.0.9"
+predicates-tree = "=1.0.11"
prettyplease = "=0.2.25"
proc-macro2 = "=1.0.93"
protobuf = "=3.2.0"
