]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'no-stderr-sink' of https://github.com/Zoxc/rust into rollup
authorAlex Crichton <alex@alexcrichton.com>
Fri, 26 Jan 2018 14:49:55 +0000 (06:49 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 26 Jan 2018 14:49:55 +0000 (06:49 -0800)
1  2 
src/librustc/hir/lowering.rs
src/librustc/session/config.rs
src/librustc/session/mod.rs
src/librustc_trans/back/write.rs

Simple merge
Simple merge
Simple merge
index db8db16a6c421d6dfd396ac77ddb0c51122f4a18,884d4c7d14b588b3f95375afaf13788c4cc279ac..8afa63a5e9735e113bceac783870cdca3d54d91f
@@@ -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();