nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Canonical trait impls more robust

Browse Source
This commit is contained in:
Oli Scherer 2024-03-22 12:18:08 +00:00
parent 0689a4f4f7
commit ea44ce059b
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_type_ir/src/canonical.rs
View File

@ -63,28 +63,30 @@ impl<I: Interner, V: Eq> Eq for Canonical<I, V> {}
impl<I: Interner, V: PartialEq> PartialEq for Canonical<I, V> { impl<I: Interner, V: PartialEq> PartialEq for Canonical<I, V> {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
self.value == other.value let Self { value, max_universe, variables } = self;
&& self.max_universe == other.max_universe *value == other.value
&& self.variables == other.variables && *max_universe == other.max_universe
&& *variables == other.variables
} }
} }
impl<I: Interner, V: fmt::Display> fmt::Display for Canonical<I, V> { impl<I: Interner, V: fmt::Display> fmt::Display for Canonical<I, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let Self { value, max_universe, variables } = self;
write!( write!(
f, f,
"Canonical {{ value: {}, max_universe: {:?}, variables: {:?} }}", "Canonical {{ value: {value}, max_universe: {max_universe:?}, variables: {variables:?} }}",
self.value, self.max_universe, self.variables
) )
} }
} }
impl<I: Interner, V: fmt::Debug> fmt::Debug for Canonical<I, V> { impl<I: Interner, V: fmt::Debug> fmt::Debug for Canonical<I, V> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let Self { value, max_universe, variables } = self;
f.debug_struct("Canonical") f.debug_struct("Canonical")
.field("value", &self.value) .field("value", &value)
.field("max_universe", &self.max_universe) .field("max_universe", &max_universe)
.field("variables", &self.variables) .field("variables", &variables)
.finish() .finish()
} }
} }
@ -109,9 +111,10 @@ where
I::CanonicalVars: TypeVisitable<I>, I::CanonicalVars: TypeVisitable<I>,
{ {
fn visit_with<F: TypeVisitor<I>>(&self, folder: &mut F) -> F::Result { fn visit_with<F: TypeVisitor<I>>(&self, folder: &mut F) -> F::Result {
try_visit!(self.value.visit_with(folder)); let Self { value, max_universe, variables } = self;
try_visit!(self.max_universe.visit_with(folder)); try_visit!(value.visit_with(folder));
self.variables.visit_with(folder) try_visit!(max_universe.visit_with(folder));
variables.visit_with(folder)
} }
} }