Skip to content

Update dependencies #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
regexident merged 3 commits into from
Sep 12, 2025
Merged

Update dependencies #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd06129
Update dependencies
renovate[bot] Sep 8, 2025
26d0859
Update test snapshots
regexident Sep 12, 2025
15821dc
Bump CI toolchain from "1.78.0" to "1.86.0" (as required by `tryexpan…
regexident Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
- uses: dtolnay/rust-toolchain@v1
with:
# update `cargo-expand` accordingly, when bumping MSRV:
toolchain: 1.78.0
toolchain: 1.86.0
components: rust-src
- uses: cargo-bins/cargo-binstall@v1.14.1
- uses: cargo-bins/cargo-binstall@v1.15.4
- run: cargo binstall cargo-expand@1.0.95 --no-confirm
- run: cargo test -- --test-threads=1

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ version = { workspace = true }
enumcapsulate-macros = { version = "0.6.3", path = "./macros", optional = true }

[dev-dependencies]
tryexpand = "=0.10.0"
tryexpand = "=0.12.0"

[features]
default = ["derive"]
Expand Down
22 changes: 11 additions & 11 deletions tests/derive-tests/smoke/pass/enum/smoke.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ impl ::core::clone::Clone for CustomDiscriminant {
impl ::core::cmp::Ord for CustomDiscriminant {
#[inline]
fn cmp(&self, other: &CustomDiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -302,9 +302,9 @@ impl ::core::cmp::PartialOrd for CustomDiscriminant {
&self,
other: &CustomDiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -320,17 +320,17 @@ impl ::core::marker::StructuralPartialEq for CustomDiscriminant {}
impl ::core::cmp::PartialEq for CustomDiscriminant {
#[inline]
fn eq(&self, other: &CustomDiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
}
}
#[automatically_derived]
impl ::core::hash::Hash for CustomDiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state)
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state)
}
}
#[automatically_derived]
Expand Down
22 changes: 11 additions & 11 deletions tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ impl ::core::clone::Clone for VariantADiscriminant {
impl ::core::cmp::Ord for VariantADiscriminant {
#[inline]
fn cmp(&self, other: &VariantADiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -32,9 +32,9 @@ impl ::core::cmp::PartialOrd for VariantADiscriminant {
&self,
other: &VariantADiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -50,17 +50,17 @@ impl ::core::marker::StructuralPartialEq for VariantADiscriminant {}
impl ::core::cmp::PartialEq for VariantADiscriminant {
#[inline]
fn eq(&self, other: &VariantADiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
}
}
#[automatically_derived]
impl ::core::hash::Hash for VariantADiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state)
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state)
}
}
#[automatically_derived]
Expand Down
2 changes: 1 addition & 1 deletion tests/derive-tests/variant_discriminant/pass/enum/lifetimes.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ impl ::core::cmp::PartialEq for EnumWithLifetimeDiscriminant {
(
EnumWithLifetimeDiscriminant::VariantA(__self_0),
EnumWithLifetimeDiscriminant::VariantA(__arg1_0),
) => *__self_0 == *__arg1_0,
) => __self_0 == __arg1_0,
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
impl ::core::cmp::Ord for EnumDiscriminant {
#[inline]
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -46,9 +46,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
&self,
other: &EnumDiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -64,17 +64,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
impl ::core::cmp::PartialEq for EnumDiscriminant {
#[inline]
fn eq(&self, other: &EnumDiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
}
}
#[automatically_derived]
impl ::core::hash::Hash for EnumDiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state)
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state)
}
}
#[automatically_derived]
Expand Down
22 changes: 11 additions & 11 deletions tests/derive-tests/variant_discriminant/pass/enum/name.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ impl ::core::clone::Clone for RenamedDiscriminant {
impl ::core::cmp::Ord for RenamedDiscriminant {
#[inline]
fn cmp(&self, other: &RenamedDiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -38,9 +38,9 @@ impl ::core::cmp::PartialOrd for RenamedDiscriminant {
&self,
other: &RenamedDiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -56,17 +56,17 @@ impl ::core::marker::StructuralPartialEq for RenamedDiscriminant {}
impl ::core::cmp::PartialEq for RenamedDiscriminant {
#[inline]
fn eq(&self, other: &RenamedDiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
}
}
#[automatically_derived]
impl ::core::hash::Hash for RenamedDiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state)
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state)
}
}
#[automatically_derived]
Expand Down
28 changes: 14 additions & 14 deletions tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
impl ::core::cmp::Ord for EnumDiscriminant {
#[inline]
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
match ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag) {
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
match ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr) {
::core::cmp::Ordering::Equal => {
match (self, other) {
(
Expand Down Expand Up @@ -277,8 +277,8 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
&self,
other: &EnumDiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
match (self, other) {
(
EnumDiscriminant::VariantC(__self_0),
Expand All @@ -292,7 +292,7 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
EnumDiscriminant::VariantE(__self_0),
EnumDiscriminant::VariantE(__arg1_0),
) => ::core::cmp::PartialOrd::partial_cmp(__self_0, __arg1_0),
_ => ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag),
_ => ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr),
}
}
}
Expand All @@ -317,22 +317,22 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
impl ::core::cmp::PartialEq for EnumDiscriminant {
#[inline]
fn eq(&self, other: &EnumDiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
&& match (self, other) {
(
EnumDiscriminant::VariantC(__self_0),
EnumDiscriminant::VariantC(__arg1_0),
) => *__self_0 == *__arg1_0,
) => __self_0 == __arg1_0,
(
EnumDiscriminant::RenamedVariant(__self_0),
EnumDiscriminant::RenamedVariant(__arg1_0),
) => *__self_0 == *__arg1_0,
) => __self_0 == __arg1_0,
(
EnumDiscriminant::VariantE(__self_0),
EnumDiscriminant::VariantE(__arg1_0),
) => *__self_0 == *__arg1_0,
) => __self_0 == __arg1_0,
_ => true,
}
}
Expand All @@ -341,8 +341,8 @@ impl ::core::cmp::PartialEq for EnumDiscriminant {
impl ::core::hash::Hash for EnumDiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state);
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state);
match self {
EnumDiscriminant::VariantC(__self_0) => {
::core::hash::Hash::hash(__self_0, state)
Expand Down
22 changes: 11 additions & 11 deletions tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
impl ::core::cmp::Ord for EnumDiscriminant {
#[inline]
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -39,9 +39,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
&self,
other: &EnumDiscriminant,
) -> ::core::option::Option<::core::cmp::Ordering> {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
}
}
#[automatically_derived]
Expand All @@ -57,17 +57,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
impl ::core::cmp::PartialEq for EnumDiscriminant {
#[inline]
fn eq(&self, other: &EnumDiscriminant) -> bool {
let __self_tag = ::core::intrinsics::discriminant_value(self);
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
__self_tag == __arg1_tag
let __self_discr = ::core::intrinsics::discriminant_value(self);
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
__self_discr == __arg1_discr
}
}
#[automatically_derived]
impl ::core::hash::Hash for EnumDiscriminant {
#[inline]
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
let __self_tag = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_tag, state)
let __self_discr = ::core::intrinsics::discriminant_value(self);
::core::hash::Hash::hash(&__self_discr, state)
}
}
#[automatically_derived]
Expand Down
Loading