From 9afa1e2e15e420425f6e73de8210ab93d1d4cc43 Mon Sep 17 00:00:00 2001 From: vms Date: Tue, 29 Dec 2020 12:41:02 +0300 Subject: [PATCH] rename FlattenIValues Iterator to FlattenIRecordIterator --- wasmer-it/src/serde/de.rs | 6 +++--- wasmer-it/src/values.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wasmer-it/src/serde/de.rs b/wasmer-it/src/serde/de.rs index 2729615..adc21c1 100644 --- a/wasmer-it/src/serde/de.rs +++ b/wasmer-it/src/serde/de.rs @@ -1,6 +1,6 @@ //! Provides a deserializer from WIT values to Rust value. -use crate::{values::FlattenIValueIterator, IType, IValue}; +use crate::{values::FlattenIRecordIterator, IType, IValue}; use serde::{de, Deserialize}; use std::{ fmt::{self, Display}, @@ -65,13 +65,13 @@ where /// The deserializer. The iterator iterates over `IValue`s, /// all flatten, see `FlattenIValueIterator`. struct Deserializer<'de> { - iterator: Peekable>, + iterator: Peekable>, } impl<'de> Deserializer<'de> { pub fn new(input: &'de [IValue]) -> Deserializer<'de> { Deserializer { - iterator: FlattenIValueIterator::new(input).peekable(), + iterator: FlattenIRecordIterator::new(input).peekable(), } } } diff --git a/wasmer-it/src/values.rs b/wasmer-it/src/values.rs index 9885d65..e4ac751 100644 --- a/wasmer-it/src/values.rs +++ b/wasmer-it/src/values.rs @@ -8,11 +8,11 @@ pub use crate::serde::{de::from_interface_values, ser::to_interface_value}; /// Iterates over a vector of `IValues` but flatten all the /// values. So `I32(1), Record([I32(2), I32(3)]), I32(4)` will be /// iterated like `I32(1), I32(2), I32(3), I32(4)`. -pub(crate) struct FlattenIValueIterator<'a> { +pub(crate) struct FlattenIRecordIterator<'a> { iterators: Vec>, } -impl<'a> FlattenIValueIterator<'a> { +impl<'a> FlattenIRecordIterator<'a> { pub(crate) fn new(values: &'a [IValue]) -> Self { Self { iterators: vec![values.iter()], @@ -20,7 +20,7 @@ impl<'a> FlattenIValueIterator<'a> { } } -impl<'a> Iterator for FlattenIValueIterator<'a> { +impl<'a> Iterator for FlattenIRecordIterator<'a> { type Item = &'a IValue; fn next(&mut self) -> Option {