---

yaml
---
r: 12110
b: refs/heads/master
c: ac4294a
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7ae757ff1a54f1b420655dfefd505c140bfee16e
+refs/heads/master: ac4294a176f643c9c1f9bb992bf1b2f690499c30
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/test/run-pass/alt-with-ret-arm.rs

@@ -0,0 +1,11 @@
+fn main() {
+    // sometimes we have had trouble finding
+    // the right type for f, as we unified
+    // bot and u32 here
+    let f = alt uint::from_str("1234") {
+        none { ret () }
+        some(num) { num as u32 }
+    };
+    assert f == 1234u32;
+    log(error, f)
+}