Rename HIR TypeBinding to AssocItemConstraint and related cleanup

fmease · fmease · commit a2c6f80a45f8 · 2024-05-30T22:52:33.000+02:00
diff --git a/src/types.rs b/src/types.rs
@@ -140,7 +140,7 @@ pub(crate) enum SegmentParam<'a> {
     Const(&'a ast::AnonConst),
     LifeTime(&'a ast::Lifetime),
     Type(&'a ast::Ty),
-    Binding(&'a ast::AssocConstraint),
+    Binding(&'a ast::AssocItemConstraint),
 }
 
 impl<'a> SegmentParam<'a> {
@@ -175,9 +175,9 @@ impl<'a> Rewrite for SegmentParam<'a> {
     }
 }
 
-impl Rewrite for ast::AssocConstraint {
+impl Rewrite for ast::AssocItemConstraint {
     fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
-        use ast::AssocConstraintKind::{Bound, Equality};
+        use ast::AssocItemConstraintKind::{Bound, Equality};
 
         let mut result = String::with_capacity(128);
         result.push_str(rewrite_ident(context, self.ident));
@@ -205,14 +205,14 @@ impl Rewrite for ast::AssocConstraint {
     }
 }
 
-impl Rewrite for ast::AssocConstraintKind {
+impl Rewrite for ast::AssocItemConstraintKind {
     fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
         match self {
-            ast::AssocConstraintKind::Equality { term } => match term {
+            ast::AssocItemConstraintKind::Equality { term } => match term {
                 Term::Ty(ty) => ty.rewrite(context, shape),
                 Term::Const(c) => c.rewrite(context, shape),
             },
-            ast::AssocConstraintKind::Bound { bounds } => bounds.rewrite(context, shape),
+            ast::AssocItemConstraintKind::Bound { bounds } => bounds.rewrite(context, shape),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ pub(crate) enum SegmentParam<'a> {`
`140`	`140`	`Const(&'a ast::AnonConst),`
`141`	`141`	`LifeTime(&'a ast::Lifetime),`
`142`	`142`	`Type(&'a ast::Ty),`
`143`		`- Binding(&'a ast::AssocConstraint),`
	`143`	`+ Binding(&'a ast::AssocItemConstraint),`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`impl<'a> SegmentParam<'a> {`
`@@ -175,9 +175,9 @@ impl<'a> Rewrite for SegmentParam<'a> {`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`-impl Rewrite for ast::AssocConstraint {`
	`178`	`+impl Rewrite for ast::AssocItemConstraint {`
`179`	`179`	`fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {`
`180`		`- use ast::AssocConstraintKind::{Bound, Equality};`
	`180`	`+ use ast::AssocItemConstraintKind::{Bound, Equality};`
`181`	`181`
`182`	`182`	`let mut result = String::with_capacity(128);`
`183`	`183`	`result.push_str(rewrite_ident(context, self.ident));`
`@@ -205,14 +205,14 @@ impl Rewrite for ast::AssocConstraint {`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`
`208`		`-impl Rewrite for ast::AssocConstraintKind {`
	`208`	`+impl Rewrite for ast::AssocItemConstraintKind {`
`209`	`209`	`fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {`
`210`	`210`	`match self {`
`211`		`- ast::AssocConstraintKind::Equality { term } => match term {`
	`211`	`+ ast::AssocItemConstraintKind::Equality { term } => match term {`
`212`	`212`	`Term::Ty(ty) => ty.rewrite(context, shape),`
`213`	`213`	`Term::Const(c) => c.rewrite(context, shape),`
`214`	`214`	`},`
`215`		`- ast::AssocConstraintKind::Bound { bounds } => bounds.rewrite(context, shape),`
	`215`	`+ ast::AssocItemConstraintKind::Bound { bounds } => bounds.rewrite(context, shape),`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`}`