Fixes

Author: nrc

src/libcore/macros.rs

@@ -189,6 +189,7 @@ macro_rules! debug_assert_eq {
     ($($arg:tt)*) => (if cfg!(debug_assertions) { assert_eq!($($arg)*); })
 }
 
+/// Helper macro for unwrapping `Result` values while returning early with an
 /// error if the value of the expression is `Err`. Can only be used in
 /// functions that return `Result` because of the early return of `Err` that
 /// it provides.
@@ -228,7 +229,6 @@ macro_rules! try {
         }
     })
 }
-/// Helper macro for unwrapping `Result` values while returning early with an
 #[cfg(not(stage0))]
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]

src/librustc/hir/lowering.rs

@@ -1531,11 +1531,11 @@ impl<'a> LoweringContext<'a> {
                                                               e.span,
                                                               hir::PopUnstableBlock,
                                                               ThinVec::new());
-    
+
                         let path = self.std_path(e.span, &["ops", "Carrier", "translate"]);
                         let path = self.expr_path(path, ThinVec::new());
                         let call = self.expr_call(e.span, path, hir_vec![sub_expr]);
-    
+
                         self.signal_block_expr(hir_vec![],
                                                call,
                                                e.span,

src/test/run-pass/try-operator-custom.rs

@@ -33,8 +33,8 @@ impl<U, V> Carrier for MyResult<U, V> {
         where T: Carrier<Success=U, Error=V>
     {
         match self {
-            MyResult::Awesome(u) => T::from_success(u.into()),
-            MyResult::Terrible(e) => T::from_error(e.into()),
+            MyResult::Awesome(u) => T::from_success(u),
+            MyResult::Terrible(e) => T::from_error(e),
         }
     }
 }