use non_erasable_generics

BoxyUwU · BoxyUwU · commit 47fe696d8f24 · 2021-06-08T09:07:52.000+01:00
diff --git a/compiler/rustc_middle/src/ty/diagnostics.rs b/compiler/rustc_middle/src/ty/diagnostics.rs
@@ -54,7 +54,7 @@ impl<'tcx> TyS<'tcx> {
     /// ADTs with no type arguments.
     pub fn is_simple_text(&self) -> bool {
         match self.kind() {
-            Adt(_, substs) => substs.types().next().is_none() && substs.consts().next().is_none(),
+            Adt(_, substs) => substs.non_erasable_generics().next().is_none(),
             Ref(_, ty, _) => ty.is_simple_text(),
             _ => self.is_simple_ty(),
         }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ impl<'tcx> TyS<'tcx> {`
`54`	`54`	`/// ADTs with no type arguments.`
`55`	`55`	`pub fn is_simple_text(&self) -> bool {`
`56`	`56`	`match self.kind() {`
`57`		`- Adt(_, substs) => substs.types().next().is_none() && substs.consts().next().is_none(),`
	`57`	`+ Adt(_, substs) => substs.non_erasable_generics().next().is_none(),`
`58`	`58`	`Ref(_, ty, _) => ty.is_simple_text(),`
`59`	`59`	`_ => self.is_simple_ty(),`
`60`	`60`	`}`