---

yaml
---
r: 276595
b: refs/heads/try
c: 064ec35
h: refs/heads/master
i:
  276593: bbfb15f
  276591: 3daf229

Author: Jorge Aparicio

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: a440c4a10c9694465c679922f0dcec9d463f3d6b
+refs/heads/try: 064ec35c18f396c2c26c05517290fdc1a4379586
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/test/run-pass/try-macro.rs

@@ -0,0 +1,57 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::num::{ParseFloatError, ParseIntError};
+
+fn main() {
+    assert_eq!(simple(), Ok(1));
+    assert_eq!(nested(), Ok(2));
+    assert_eq!(merge_ok(), Ok(3.0));
+    assert_eq!(merge_int_err(), Err(Error::Int));
+    assert_eq!(merge_float_err(), Err(Error::Float));
+}
+
+fn simple() -> Result<i32, ParseIntError> {
+    Ok(try!("1".parse()))
+}
+
+fn nested() -> Result<i32, ParseIntError> {
+    Ok(try!(try!("2".parse::<i32>()).to_string().parse::<i32>()))
+}
+
+fn merge_ok() -> Result<f32, Error> {
+    Ok(try!("1".parse::<i32>()) as f32 + try!("2.0".parse::<f32>()))
+}
+
+fn merge_int_err() -> Result<f32, Error> {
+    Ok(try!("a".parse::<i32>()) as f32 + try!("2.0".parse::<f32>()))
+}
+
+fn merge_float_err() -> Result<f32, Error> {
+    Ok(try!("1".parse::<i32>()) as f32 + try!("b".parse::<f32>()))
+}
+
+#[derive(Debug, PartialEq)]
+enum Error {
+    Int,
+    Float,
+}
+
+impl From<ParseIntError> for Error {
+    fn from(_: ParseIntError) -> Error {
+        Error::Int
+    }
+}
+
+impl From<ParseFloatError> for Error {
+    fn from(_: ParseFloatError) -> Error {
+        Error::Float
+    }
+}