]> git.lizzy.rs Git - rust.git/commitdiff
from review: code style
authorthe8472 <the8472@users.noreply.github.com>
Tue, 13 Jul 2021 20:22:24 +0000 (22:22 +0200)
committerThe8472 <git@infinite-source.de>
Thu, 30 Sep 2021 19:23:30 +0000 (21:23 +0200)
Co-authored-by: Ivan Tham <pickfire@riseup.net>
library/core/src/iter/adapters/take.rs

index bff68339ddaf62d432b6fa124d622d56a2d04810..d0d0128c82b84cd36b6162a6c9cc8a93b2b4c771 100644 (file)
@@ -115,8 +115,8 @@ fn ok<B, T>(mut f: impl FnMut(B, T) -> B) -> impl FnMut(B, T) -> Result<B, !> {
     #[inline]
     #[rustc_inherit_overflow_checks]
     fn advance_by(&mut self, n: usize) -> Result<(), usize> {
-        let min = crate::cmp::min(self.n, n);
-        return match self.iter.advance_by(min) {
+        let min = self.n.min(n);
+        match self.iter.advance_by(min) {
             Ok(_) => {
                 self.n -= min;
                 if min < n { Err(min) } else { Ok(()) }
@@ -125,7 +125,7 @@ fn advance_by(&mut self, n: usize) -> Result<(), usize> {
                 self.n -= advanced;
                 ret
             }
-        };
+        }
     }
 }