asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed Clippy warning of long return type

Browse source 
Created an alias named TablePair being a (Cow<'a, str>, Value<'a>)
This commit is contained in:
Nick Hackman 2019-08-18 21:07:23 -04:00
parent 6699b5be03
commit 9f25cfa17b
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/de.rs
View file

@ -20,6 +20,9 @@ use crate::datetime;
use crate::spanned; use crate::spanned;
use crate::tokens::{Error as TokenError, Span, Token, Tokenizer}; use crate::tokens::{Error as TokenError, Span, Token, Tokenizer};
/// Type Alias for a TOML Table pair
type TablePair<'a> = (Cow<'a, str>, Value<'a>);
/// Deserializes a byte slice into a type. /// Deserializes a byte slice into a type.
/// ///
/// This function will attempt to interpret `bytes` as UTF-8 data and then /// This function will attempt to interpret `bytes` as UTF-8 data and then
@ -292,14 +295,14 @@ impl<'de, 'b> de::Deserializer<'de> for &'b mut Deserializer<'de> {
struct Table<'a> { struct Table<'a> {
at: usize, at: usize,
header: Vec<Cow<'a, str>>, header: Vec<Cow<'a, str>>,
values: Option<Vec<(Cow<'a, str>, Value<'a>)>>, values: Option<Vec<TablePair<'a>>>,
array: bool, array: bool,
} }
#[doc(hidden)] #[doc(hidden)]
pub struct MapVisitor<'de, 'b> { pub struct MapVisitor<'de, 'b> {
values: vec::IntoIter<(Cow<'de, str>, Value<'de>)>, values: vec::IntoIter<TablePair<'de>>,
next_value: Option<(Cow<'de, str>, Value<'de>)>, next_value: Option<TablePair<'de>>,
depth: usize, depth: usize,
cur: usize, cur: usize,
cur_parent: usize, cur_parent: usize,
@ -855,7 +858,7 @@ impl<'de> de::EnumAccess<'de> for DottedTableDeserializer<'de> {
} }
struct InlineTableDeserializer<'a> { struct InlineTableDeserializer<'a> {
values: vec::IntoIter<(Cow<'a, str>, Value<'a>)>, values: vec::IntoIter<TablePair<'a>>,
next_value: Option<Value<'a>>, next_value: Option<Value<'a>>,
} }
@ -1539,7 +1542,7 @@ impl<'a> Deserializer<'a> {
// TODO(#140): shouldn't buffer up this entire table in memory, it'd be // TODO(#140): shouldn't buffer up this entire table in memory, it'd be
// great to defer parsing everything until later. // great to defer parsing everything until later.
fn inline_table(&mut self) -> Result<(Span, Vec<(Cow<'a, str>, Value<'a>)>), Error> { fn inline_table(&mut self) -> Result<(Span, Vec<TablePair<'a>>), Error> {
let mut ret = Vec::new(); let mut ret = Vec::new();
self.eat_whitespace()?; self.eat_whitespace()?;
if let Some(span) = self.eat_spanned(Token::RightBrace)? { if let Some(span) = self.eat_spanned(Token::RightBrace)? {
@ -1635,7 +1638,7 @@ impl<'a> Deserializer<'a> {
&self, &self,
mut key_parts: Vec<Cow<'a, str>>, mut key_parts: Vec<Cow<'a, str>>,
value: Value<'a>, value: Value<'a>,
values: &mut Vec<(Cow<'a, str>, Value<'a>)>, values: &mut Vec<TablePair<'a>>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key = key_parts.remove(0); let key = key_parts.remove(0);
if key_parts.is_empty() { if key_parts.is_empty() {
@ -2026,8 +2029,8 @@ enum E<'a> {
String(Cow<'a, str>), String(Cow<'a, str>),
Datetime(&'a str), Datetime(&'a str),
Array(Vec<Value<'a>>), Array(Vec<Value<'a>>),
InlineTable(Vec<(Cow<'a, str>, Value<'a>)>), InlineTable(Vec<TablePair<'a>>),
DottedTable(Vec<(Cow<'a, str>, Value<'a>)>), DottedTable(Vec<TablePair<'a>>),
} }
impl<'a> E<'a> { impl<'a> E<'a> {