about summary refs log tree commit diff
path: root/src/librustc
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-12-24 04:39:55 +0100
committerGitHub <noreply@github.com>2019-12-24 04:39:55 +0100
commit07effe18b01bfe559c6bcdc07ab7f004292bc8cc (patch)
treebef4e1441b8c3acde43ff6ff2fbadc33aeda6600 /src/librustc
parent1ac8fc76d4b732ae4bce27b1ac326a0c6462be2c (diff)
parentd918319bed23b418a98720688a3f59904aada978 (diff)
downloadrust-07effe18b01bfe559c6bcdc07ab7f004292bc8cc.tar.gz
rust-07effe18b01bfe559c6bcdc07ab7f004292bc8cc.zip
Rollup merge of #67543 - JohnTitor:regression-tests, r=Centril
Add regression tests for fixed ICEs

Closes #61747 (fixed from 1.41.0-nightly (4007d4ef2 2019-12-01))
Closes #66205 (fixed from 1.41.0-nightly (4007d4ef2 2019-12-01))
Closes #66270 (fixed by #66246)
Closes #67424 (fixed by #67160)

Also picking a minor nit up from #67071 with 101dd7bad9432730fa2f625ae43afcc2929457d4

r? @Centril
Diffstat (limited to 'src/librustc')
-rw-r--r--src/librustc/traits/error_reporting.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index 2ac2d789b2d..42db64c7915 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -2373,7 +2373,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         let span = self.tcx.def_span(generator_did);
 
         // Do not ICE on closure typeck (#66868).
-        if let None = self.tcx.hir().as_local_hir_id(generator_did) {
+        if self.tcx.hir().as_local_hir_id(generator_did).is_none() {
             return false;
         }