refactor(tvix/serde): cargo clippy

Change-Id: I3c86225040a04c9cb5702b226b4a5008ae219c42
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9093
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-08-19 16:38:31 +02:00 committed by clbot
parent 9cb38c5ba5
commit 600d4eec77
3 changed files with 13 additions and 14 deletions

View file

@ -304,8 +304,7 @@ impl<'de> de::Deserializer<'de> for NixDeserializer {
V: de::Visitor<'de>,
{
if let Value::List(list) = self.value {
let mut seq =
SeqDeserializer::new(list.into_iter().map(|value| NixDeserializer::new(value)));
let mut seq = SeqDeserializer::new(list.into_iter().map(NixDeserializer::new));
let result = visitor.visit_seq(&mut seq)?;
seq.end()?;
return Ok(result);

View file

@ -161,24 +161,24 @@ fn deserialize_enum_all() {
#[derive(Debug, Deserialize, PartialEq)]
#[serde(rename_all = "snake_case")]
enum TestEnum {
UnitVariant,
TupleVariant(String, String),
StructVariant { name: String, age: usize },
Unit,
Tuple(String, String),
Struct { name: String, age: usize },
}
let result: Vec<TestEnum> = from_str(
r#"
let
mkTuple = country: drink: { tuple_variant = [ country drink ]; };
mkTuple = country: drink: { tuple = [ country drink ]; };
in
[
(mkTuple "UK" "cask ale")
"unit_variant"
"unit"
{
struct_variant.name = "Slartibartfast";
struct_variant.age = 42;
struct.name = "Slartibartfast";
struct.age = 42;
}
(mkTuple "Russia" "квас")
@ -188,13 +188,13 @@ fn deserialize_enum_all() {
.expect("should deserialize");
let expected = vec![
TestEnum::TupleVariant("UK".into(), "cask ale".into()),
TestEnum::UnitVariant,
TestEnum::StructVariant {
TestEnum::Tuple("UK".into(), "cask ale".into()),
TestEnum::Unit,
TestEnum::Struct {
name: "Slartibartfast".into(),
age: 42,
},
TestEnum::TupleVariant("Russia".into(), "квас".into()),
TestEnum::Tuple("Russia".into(), "квас".into()),
];
assert_eq!(result, expected);

View file

@ -64,7 +64,7 @@ impl Display for Error {
)?;
for err in errors {
writeln!(f, "{}", err.fancy_format_str(&source))?;
writeln!(f, "{}", err.fancy_format_str(source))?;
}
Ok(())