robin/vdf-reader
1
0
Fork 0
mirror of https://codeberg.org/icewind/vdf-reader.git synced 2026-06-03 18:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2023-12-18 17:12:29 +01:00
commit 687a82629b
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/error.rs
View file

@ -21,7 +21,7 @@ pub enum VdfError {
#[error(transparent)] #[error(transparent)]
#[diagnostic(transparent)] #[diagnostic(transparent)]
/// Wrong event to for conversion /// Wrong event to for conversion
WrongEntryType(#[from] WrongEventTypeError), WrongEntryType(Box<WrongEventTypeError>),
#[error(transparent)] #[error(transparent)]
#[diagnostic(transparent)] #[diagnostic(transparent)]
/// Failed to parse entry into type /// Failed to parse entry into type
@ -46,6 +46,12 @@ pub enum VdfError {
Other(String), Other(String),
} }
impl From<WrongEventTypeError> for VdfError {
fn from(value: WrongEventTypeError) -> Self {
Self::WrongEntryType(value.into())
}
}
impl VdfError { impl VdfError {
pub(crate) fn with_source_span<Sp: Into<SourceSpan>, Sr: Into<String>>( pub(crate) fn with_source_span<Sp: Into<SourceSpan>, Sr: Into<String>>(
self, self,
@ -68,7 +74,7 @@ impl VdfError {
VdfError::WrongEntryType(e) => WrongEventTypeError { VdfError::WrongEntryType(e) => WrongEventTypeError {
src: source.into(), src: source.into(),
err_span: span.into(), err_span: span.into(),
..e ..*e
} }
.into(), .into(),
VdfError::SerdeParse(e) => SerdeParseError { VdfError::SerdeParse(e) => SerdeParseError {

14
src/serde.rs
View file

@ -253,7 +253,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
} }
Some(Ok(token)) => token, Some(Ok(token)) => token,
}; };
if token.span.len() == 0 { if token.span.is_empty() {
return visitor.visit_none(); return visitor.visit_none();
} }
self.push_peeked(token); self.push_peeked(token);
@ -289,7 +289,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
visitor.visit_newtype_struct(self) visitor.visit_newtype_struct(self)
} }
fn deserialize_seq<V>(mut self, visitor: V) -> Result<V::Value> fn deserialize_seq<V>(self, visitor: V) -> Result<V::Value>
where where
V: Visitor<'de>, V: Visitor<'de>,
{ {
@ -302,7 +302,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
visitor.visit_seq(StringArrayWalker::new(self.source(), seq, span)) visitor.visit_seq(StringArrayWalker::new(self.source(), seq, span))
} else { } else {
let key = self.last_key.clone(); let key = self.last_key.clone();
visitor.visit_seq(SeqWalker::new(&mut self, key)) visitor.visit_seq(SeqWalker::new(self, key))
} }
} }
@ -325,7 +325,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
self.deserialize_seq(visitor) self.deserialize_seq(visitor)
} }
fn deserialize_map<V>(mut self, visitor: V) -> Result<V::Value> fn deserialize_map<V>(self, visitor: V) -> Result<V::Value>
where where
V: Visitor<'de>, V: Visitor<'de>,
{ {
@ -349,7 +349,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
} }
}; };
let value = visitor.visit_map(TableWalker::new(&mut self, toplevel))?; let value = visitor.visit_map(TableWalker::new(self, toplevel))?;
Ok(value) Ok(value)
} }
@ -374,7 +374,7 @@ impl<'de, 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> {
where where
V: Visitor<'de>, V: Visitor<'de>,
{ {
let variant_token = self.peek().map(|r| r.ok()).flatten(); let variant_token = self.peek().and_then(|r| r.ok());
visitor visitor
.visit_enum(Enum::new(self)) .visit_enum(Enum::new(self))
.map_err(|e| match (variant_token, &e) { .map_err(|e| match (variant_token, &e) {
@ -577,7 +577,7 @@ where
let (item, rest) = self let (item, rest) = self
.remaining .remaining
.split_once(" ") .split_once(' ')
.unwrap_or((self.remaining, "")); .unwrap_or((self.remaining, ""));
let item_span = self.span.start..(self.span.start + item.len()); let item_span = self.span.start..(self.span.start + item.len());
self.remaining = rest.trim(); self.remaining = rest.trim();