commit 5bd94c128c5702589f742e958fb8ae82646357c9
author Thiébaud Weksteen <tweek@google.com> Wed Jan 06 15:18:42 2021 +0100
committer Thiébaud Weksteen <tweek@google.com> Wed Jan 06 15:18:49 2021 +0100
tree 9d69d5f15f748ab07afb7867da3216acba7f3898
parent 3b664ca54b09788037e50e8bf4cb1881bcd6cb8d

Importing rustc-1.49.0

Bug: 176888219
Change-Id: Ib0805d37e7b485cd420bbff8a8b000cf87e7ede0

library/core/src/iter/range.rs

diff --git a/library/core/src/iter/range.rs b/library/core/src/iter/range.rs
index 9f34aee..cd8ab11 100644
--- a/library/core/src/iter/range.rs
+++ b/library/core/src/iter/range.rs
@@ -713,7 +713,7 @@
         R: Try<Ok = B>,
     {
         if self.is_empty() {
-            return Try::from_ok(init);
+            return try { init };
         }
 
         let mut accum = init;
@@ -731,7 +731,7 @@
             accum = f(accum, self.start.clone())?;
         }
 
-        Try::from_ok(accum)
+        try { accum }
     }
 
     #[inline]
@@ -818,7 +818,7 @@
         R: Try<Ok = B>,
     {
         if self.is_empty() {
-            return Try::from_ok(init);
+            return try { init };
         }
 
         let mut accum = init;
@@ -836,7 +836,7 @@
             accum = f(accum, self.start.clone())?;
         }
 
-        Try::from_ok(accum)
+        try { accum }
     }
 
     #[inline]