From 4280dd466decd49845c31ec3f34a3d8301a2fe45 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 20 Jul 2016 19:20:31 +0200
Subject: [PATCH] rename deserialize_fixed_size_array to
 deserialize_seq_fixed_size

---
 serde/src/de/impls.rs       |  2 +-
 serde/src/de/mod.rs         |  6 +++---
 serde/src/de/value.rs       | 20 ++++++++++----------
 serde_test/src/de.rs        |  2 +-
 testing/tests/test_bytes.rs |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
index 4096fa8f..1680312b 100644
--- a/serde/src/de/impls.rs
+++ b/serde/src/de/impls.rs
@@ -593,7 +593,7 @@ macro_rules! array_impls {
                 fn deserialize<D>(deserializer: &mut D) -> Result<[T; $len], D::Error>
                     where D: Deserializer,
                 {
-                    deserializer.deserialize_fixed_size_array($len, $visitor::new())
+                    deserializer.deserialize_seq_fixed_size($len, $visitor::new())
                 }
             }
         )+
diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
index 668f5895..eb79562b 100644
--- a/serde/src/de/mod.rs
+++ b/serde/src/de/mod.rs
@@ -28,8 +28,8 @@ macro_rules! de_forward_to_deserialize {
     (func: deserialize_tuple) => {
         de_forward_to_deserialize!{tup_fn: deserialize_tuple}
     };
-    (func: deserialize_fixed_size_array) => {
-        de_forward_to_deserialize!{tup_fn: deserialize_fixed_size_array}
+    (func: deserialize_seq_fixed_size) => {
+        de_forward_to_deserialize!{tup_fn: deserialize_seq_fixed_size}
     };
     (func: deserialize_tuple_struct) => {
         #[inline]
@@ -400,7 +400,7 @@ pub trait Deserializer {
 
     /// This method hints that the `Deserialize` type is expecting a fixed size array. This allows
     /// deserializers to parse arrays that aren't tagged as arrays.
-    fn deserialize_fixed_size_array<V>(&mut self,
+    fn deserialize_seq_fixed_size<V>(&mut self,
                                        _len: usize,
                                        visitor: V) -> Result<V::Value, Self::Error>
         where V: Visitor;
diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs
index 1428ff22..f8e98bf8 100644
--- a/serde/src/de/value.rs
+++ b/serde/src/de/value.rs
@@ -183,7 +183,7 @@ impl<E> de::Deserializer for UnitDeserializer<E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -234,7 +234,7 @@ macro_rules! primitive_deserializer {
                 deserialize_ignored_any,
                 deserialize_bytes,
                 deserialize_unit_struct, deserialize_unit,
-                deserialize_seq, deserialize_fixed_size_array,
+                deserialize_seq, deserialize_seq_fixed_size,
                 deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
                 deserialize_tuple,
                 deserialize_enum,
@@ -316,7 +316,7 @@ impl<'a, E> de::Deserializer for StrDeserializer<'a, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_struct, deserialize_tuple_struct,
@@ -413,7 +413,7 @@ impl<E> de::Deserializer for StringDeserializer<E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_struct, deserialize_tuple_struct,
@@ -505,7 +505,7 @@ impl<I, T, E> de::Deserializer for SeqDeserializer<I, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -628,7 +628,7 @@ impl<V_, E> de::Deserializer for SeqVisitorDeserializer<V_, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -692,7 +692,7 @@ impl<I, K, V, E> de::Deserializer for MapDeserializer<I, K, V, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -820,7 +820,7 @@ impl<V_, E> de::Deserializer for MapVisitorDeserializer<V_, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -867,7 +867,7 @@ impl<'a, E> de::Deserializer for BytesDeserializer<'a, E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
@@ -918,7 +918,7 @@ impl<E> de::Deserializer for ByteBufDeserializer<E>
         deserialize_ignored_any,
         deserialize_bytes,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,
diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs
index 99c6e0a7..c9a5aeeb 100644
--- a/serde_test/src/de.rs
+++ b/serde_test/src/de.rs
@@ -255,7 +255,7 @@ impl<I> de::Deserializer for Deserializer<I>
         }
     }
 
-    fn deserialize_fixed_size_array<V>(&mut self,
+    fn deserialize_seq_fixed_size<V>(&mut self,
                                        len: usize,
                                        visitor: V) -> Result<V::Value, Error>
         where V: Visitor,
diff --git a/testing/tests/test_bytes.rs b/testing/tests/test_bytes.rs
index a8bb2f9f..021baa64 100644
--- a/testing/tests/test_bytes.rs
+++ b/testing/tests/test_bytes.rs
@@ -315,7 +315,7 @@ impl serde::Deserializer for BytesDeserializer {
         deserialize_char, deserialize_str, deserialize_string,
         deserialize_ignored_any,
         deserialize_unit_struct, deserialize_unit,
-        deserialize_seq, deserialize_fixed_size_array,
+        deserialize_seq, deserialize_seq_fixed_size,
         deserialize_map, deserialize_newtype_struct, deserialize_struct_field,
         deserialize_tuple,
         deserialize_enum,