Don't unwrap() in in_std()

hyd-dev · hyd-dev · commit 545101040df0 · 2021-06-06T11:12:13.000+08:00
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -631,8 +631,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
     fn in_std(&self) -> bool {
         let this = self.eval_context_ref();
-        this.tcx.def_path(this.frame().instance.def_id()).krate
-            == this.tcx.def_path(this.tcx.lang_items().start_fn().unwrap()).krate
+        this.tcx.lang_items().start_fn().map_or(false, |start_fn| {
+            this.tcx.def_path(this.frame().instance.def_id()).krate
+                == this.tcx.def_path(start_fn).krate
+        })
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -631,8 +631,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`631`	`631`
`632`	`632`	`fn in_std(&self) -> bool {`
`633`	`633`	`let this = self.eval_context_ref();`
`634`		`- this.tcx.def_path(this.frame().instance.def_id()).krate`
`635`		`- == this.tcx.def_path(this.tcx.lang_items().start_fn().unwrap()).krate`
	`634`	`+ this.tcx.lang_items().start_fn().map_or(false, \|start_fn\| {`
	`635`	`+ this.tcx.def_path(this.frame().instance.def_id()).krate`
	`636`	`+ == this.tcx.def_path(start_fn).krate`
	`637`	`+ })`
`636`	`638`	`}`
`637`	`639`	`}`
`638`	`640`