---

yaml
---
r: 262546
b: refs/heads/snap-stage3
c: 433f347
h: refs/heads/master

Author: durka

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 5a0308abadce38396f27122d5c8639ffb2a21469
-refs/heads/snap-stage3: e13d352aaff9ab76d912adc2c119f4019a1f8ead
+refs/heads/snap-stage3: 433f34799c5ccef2a10febb656d7568857bab2b6
 refs/heads/try: 29d24a3b02cb805da19450bf9830a8f0a6bd859c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/librustc_trans/trans/collector.rs

@@ -501,7 +501,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
                         .tcx()
                         .lang_items
                         .require(ExchangeMallocFnLangItem)
-                        .expect("Could not find ExchangeMallocFnLangItem");
+                        .unwrap_or_else(|e| self.ccx.sess().fatal(&e));
 
                 assert!(can_have_local_instance(self.ccx, exchange_malloc_fn_def_id));
                 let exchange_malloc_fn_trans_item =
@@ -645,7 +645,7 @@ fn find_drop_glue_neighbors<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
         let exchange_free_fn_def_id = ccx.tcx()
                                          .lang_items
                                          .require(ExchangeFreeFnLangItem)
-                                         .expect("Could not find ExchangeFreeFnLangItem");
+                                         .unwrap_or_else(|e| ccx.sess().fatal(&e));
 
         assert!(can_have_local_instance(ccx, exchange_free_fn_def_id));
         let exchange_free_fn_trans_item =