New upstream version 1.27.1+dfsg1

[rustc.git] / src / vendor / serde / src / de / value.rs

diff --git a/src/vendor/serde/src/de/value.rs b/src/vendor/serde/src/de/value.rs
index 6dd1d21f02e0896fff53018465c54d3629e39d88..8d305b796f577987cce73c2ebac71507e79e943b 100644 (file)
--- a/src/vendor/serde/src/de/value.rs
+++ b/src/vendor/serde/src/de/value.rs
@@ -37,10 +37,10 @@
 
 use lib::*;
 
+use self::private::{First, Second};
 use de::{self, Expected, IntoDeserializer, SeqAccess};
 use private::de::size_hint;
 use ser;
-use self::private::{First, Second};
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -652,11 +652,8 @@ where
 {
     /// Check for remaining elements after passing a `SeqDeserializer` to
     /// `Visitor::visit_seq`.
-    pub fn end(mut self) -> Result<(), E> {
-        let mut remaining = 0;
-        while self.iter.next().is_some() {
-            remaining += 1;
-        }
+    pub fn end(self) -> Result<(), E> {
+        let remaining = self.iter.count();
         if remaining == 0 {
             Ok(())
         } else {
@@ -849,11 +846,8 @@ where
 {
     /// Check for remaining elements after passing a `MapDeserializer` to
     /// `Visitor::visit_map`.
-    pub fn end(mut self) -> Result<(), E> {
-        let mut remaining = 0;
-        while self.iter.next().is_some() {
-            remaining += 1;
-        }
+    pub fn end(self) -> Result<(), E> {
+        let remaining = self.iter.count();
         if remaining == 0 {
             Ok(())
         } else {