Skip to content

Commit 29846ff

Browse files
committed
---
yaml --- r: 22174 b: refs/heads/snap-stage3 c: 9a8d4ad h: refs/heads/master v: v3
1 parent b0f9c15 commit 29846ff

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: eba5eeaef843d9f2a8b84926ba12dfa84d6d3541
4+
refs/heads/snap-stage3: 9a8d4adb7decf774bbb87c7a8415c1a95fe1825b
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/task/spawn.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,9 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
451451
// it should be enabled only in debug builds.
452452
let new_generation =
453453
match *old_ancestors {
454-
Some(ref arc) => access_ancestors(arc, |a| a.generation+1),
454+
Some(ref arc) => {
455+
access_ancestors(arc, |a| a.generation+1)
456+
}
455457
None => 0 // the actual value doesn't really matter.
456458
};
457459
assert new_generation < uint::max_value;

branches/snap-stage3/src/rustc/back/link.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ mod write {
225225

226226
jit::exec(sess, pm.llpm, llmod, CodeGenOptLevel, true);
227227

228-
if sess.time_llvm_passes() { llvm::LLVMRustPrintPassTimings(); }
228+
if sess.time_llvm_passes() {
229+
llvm::LLVMRustPrintPassTimings();
230+
}
229231
return;
230232
}
231233

0 commit comments

Comments
 (0)