From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 26 Jan 2018 14:49:55 +0000 (-0800)
Subject: Merge branch 'no-stderr-sink' of https://github.com/Zoxc/rust into rollup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=95942155da62e80f59b425a290a6eff502787ded;p=rust.git

Merge branch 'no-stderr-sink' of https://github.com/Zoxc/rust into rollup
---

95942155da62e80f59b425a290a6eff502787ded
diff --cc src/librustc_trans/back/write.rs
index db8db16a6c4,884d4c7d14b..8afa63a5e97
--- a/src/librustc_trans/back/write.rs
+++ b/src/librustc_trans/back/write.rs
@@@ -588,8 -576,13 +588,8 @@@ fn generate_lto_work(cgcx: &CodegenCont
                   TRANS_WORK_PACKAGE_KIND,
                   "generate lto")
      }).unwrap_or(Timeline::noop());
 -    let mode = if cgcx.lto {
 -        lto::LTOMode::WholeCrateGraph
 -    } else {
 -        lto::LTOMode::JustThisCrate
 -    };
 -    let lto_modules = lto::run(cgcx, modules, mode, &mut timeline)
 +    let lto_modules = lto::run(cgcx, modules, &mut timeline)
-         .unwrap_or_else(|e| panic!(e));
+         .unwrap_or_else(|e| e.raise());
  
      lto_modules.into_iter().map(|module| {
          let cost = module.cost();