Improve error message when we try to get_type on something that does not have a type

lochsh · lochsh · commit d38dbcb19f6e · 2020-11-18T21:20:51.000Z
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs
@@ -947,7 +947,12 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
     }
 
     fn get_type(&self, id: DefIndex, tcx: TyCtxt<'tcx>) -> Ty<'tcx> {
-        self.root.tables.ty.get(self, id).unwrap().decode((self, tcx))
+        self.root
+            .tables
+            .ty
+            .get(self, id)
+            .unwrap_or_else(|| panic!("Not a type: {:?}", id))
+            .decode((self, tcx))
     }
 
     fn get_stability(&self, id: DefIndex) -> Option<attr::Stability> {

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,12 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`fn get_type(&self, id: DefIndex, tcx: TyCtxt<'tcx>) -> Ty<'tcx> {`
`950`		`- self.root.tables.ty.get(self, id).unwrap().decode((self, tcx))`
	`950`	`+ self.root`
	`951`	`+ .tables`
	`952`	`+ .ty`
	`953`	`+ .get(self, id)`
	`954`	`+ .unwrap_or_else(\|\| panic!("Not a type: {:?}", id))`
	`955`	`+ .decode((self, tcx))`
`951`	`956`	`}`
`952`	`957`
`953`	`958`	`fn get_stability(&self, id: DefIndex) -> Option<attr::Stability> {`