Importing rustc-1.50.0
Change-Id: I8a6a411323d8d36681b16caad8d4314b5f71c5b9
Bug: 180268112
diff --git a/compiler/rustc_save_analysis/src/sig.rs b/compiler/rustc_save_analysis/src/sig.rs
index 1bf8160..ff445d7 100644
--- a/compiler/rustc_save_analysis/src/sig.rs
+++ b/compiler/rustc_save_analysis/src/sig.rs
@@ -21,7 +21,7 @@
// references.
//
// Signatures do not include visibility info. I'm not sure if this is a feature
-// or an ommission (FIXME).
+// or an omission (FIXME).
//
// FIXME where clauses need implementing, defs/refs in generics are mostly missing.
@@ -550,7 +550,7 @@
// FIXME where clause
}
- hir::ItemKind::ForeignMod(_) => Err("extern mod"),
+ hir::ItemKind::ForeignMod { .. } => Err("extern mod"),
hir::ItemKind::GlobalAsm(_) => Err("global asm"),
hir::ItemKind::ExternCrate(_) => Err("extern crate"),
hir::ItemKind::OpaqueTy(..) => Err("opaque type"),
@@ -677,7 +677,7 @@
let mut text = self.ident.to_string();
match self.data {
hir::VariantData::Struct(fields, r) => {
- let id = parent_id.unwrap();
+ let id = parent_id.ok_or("Missing id for Variant's parent")?;
let name_def = SigElement {
id: id_from_hir_id(id, scx),
start: offset,
