Skip to content

Commit

Permalink
Pacify make tidy.
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwoerister committed Jul 8, 2016
1 parent 3a47103 commit 00226fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 0 additions & 2 deletions src/librustc_trans/back/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -812,12 +812,10 @@ pub fn run_passes(sess: &Session,
copy_if_one_unit(OutputType::LlvmAssembly, false);
}
OutputType::Assembly => {
// TODO: These are probably wrong
copy_if_one_unit(OutputType::Assembly, false);
}
OutputType::Object => {
user_wants_objects = true;
// TODO: These are probably wrong
copy_if_one_unit(OutputType::Object, true);
}
OutputType::Exe |
Expand Down
7 changes: 5 additions & 2 deletions src/librustc_trans/collector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,11 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
match *rvalue {
mir::Rvalue::Aggregate(mir::AggregateKind::Closure(def_id,
ref substs), _) => {
let mir = errors::expect(self.scx.sess().diagnostic(), self.scx.get_mir(def_id),
|| format!("Could not find MIR for closure: {:?}", def_id));
let mir = errors::expect(self.scx.sess().diagnostic(),
self.scx.get_mir(def_id),
|| {
format!("Could not find MIR for closure: {:?}", def_id)
});

let concrete_substs = monomorphize::apply_param_substs(self.scx.tcx(),
self.param_substs,
Expand Down

0 comments on commit 00226fc

Please sign in to comment.