Merge #8144

bors[bot] · 0xPoe · web-flow · commit 3af1885bd2c4 · 2021-03-22T12:35:44.000Z
8144: bail out early for source code closures r=Veykril a=hi-rustin close #8084 Co-authored-by: hi-rustin <rustin.liu@gmail.com>
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
@@ -190,6 +190,7 @@ impl DisplayTarget {
 pub enum DisplaySourceCodeError {
     PathNotFound,
     UnknownType,
+    Closure,
 }
 
 pub enum HirDisplayError {
@@ -543,6 +544,11 @@ impl HirDisplay for Ty {
                 }
             }
             TyKind::Closure(.., substs) => {
+                if f.display_target.is_source_code() {
+                    return Err(HirDisplayError::DisplaySourceCodeError(
+                        DisplaySourceCodeError::Closure,
+                    ));
+                }
                 let sig = substs[0].callable_sig(f.db);
                 if let Some(sig) = sig {
                     if sig.params().is_empty() {

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ impl DisplayTarget {`
`190`	`190`	`pub enum DisplaySourceCodeError {`
`191`	`191`	`PathNotFound,`
`192`	`192`	`UnknownType,`
	`193`	`+ Closure,`
`193`	`194`	`}`
`194`	`195`
`195`	`196`	`pub enum HirDisplayError {`
`@@ -543,6 +544,11 @@ impl HirDisplay for Ty {`
`543`	`544`	`}`
`544`	`545`	`}`
`545`	`546`	`TyKind::Closure(.., substs) => {`
	`547`	`+ if f.display_target.is_source_code() {`
	`548`	`+ return Err(HirDisplayError::DisplaySourceCodeError(`
	`549`	`+ DisplaySourceCodeError::Closure,`
	`550`	`+ ));`
	`551`	`+ }`
`546`	`552`	`let sig = substs[0].callable_sig(f.db);`
`547`	`553`	`if let Some(sig) = sig {`
`548`	`554`	`if sig.params().is_empty() {`