article and descr for closures

mark-i-m · mark-i-m · commit c6781037eb58 · 2020-02-22T13:17:04.000-06:00
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -1520,10 +1520,11 @@ impl<'tcx> TyCtxt<'tcx> {
                 let kind = self.def_kind(def_id).unwrap();
                 (kind.article(), kind.descr(def_id))
             }
-            DefPathData::ClosureExpr => {
-                // TODO
-                todo!();
-            }
+            DefPathData::ClosureExpr => match self.generator_kind(def_id) {
+                None => ("a", "closure"),
+                Some(rustc_hir::GeneratorKind::Async(..)) => ("an", "async closure"),
+                Some(rustc_hir::GeneratorKind::Gen) => ("a", "generator"),
+            },
             _ => bug!("article_and_description called on def_id {:?}", def_id),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1520,10 +1520,11 @@ impl<'tcx> TyCtxt<'tcx> {`
`1520`	`1520`	`let kind = self.def_kind(def_id).unwrap();`
`1521`	`1521`	`(kind.article(), kind.descr(def_id))`
`1522`	`1522`	`}`
`1523`		`- DefPathData::ClosureExpr => {`
`1524`		`- // TODO`
`1525`		`- todo!();`
`1526`		`- }`
	`1523`	`+ DefPathData::ClosureExpr => match self.generator_kind(def_id) {`
	`1524`	`+ None => ("a", "closure"),`
	`1525`	`+ Some(rustc_hir::GeneratorKind::Async(..)) => ("an", "async closure"),`
	`1526`	`+ Some(rustc_hir::GeneratorKind::Gen) => ("a", "generator"),`
	`1527`	`+ },`
`1527`	`1528`	`_ => bug!("article_and_description called on def_id {:?}", def_id),`
`1528`	`1529`	`}`
`1529`	`1530`	`}`