maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix): fix trivial clippy lints

Browse source 
Relates to b/321.

Change-Id: I37284f89b186e469eb432e2bbedb37aa125a6ad4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9961
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
Vincent Ambo 2023-11-05 20:31:46 +03:00 • committed by clbot
parent 67999f0dcf
commit b3b1f649d6
14 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/nix-compat/src/derivation/parser.rs
View file

@ -19,7 +19,7 @@ use crate::{aterm, nixhash};
#[derive(Debug, thiserror::Error)]
pub enum Error<I> {
#[error("parsing error: {0}")]
ParseError(NomError<I>),
Parser(NomError<I>),
#[error("premature EOF")]
Incomplete,
#[error("validation error: {0}")]
@ -38,7 +38,7 @@ pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
Ok(derivation)
}
Err(nom::Err::Incomplete(_)) => Err(Error::Incomplete),
Err(nom::Err::Error(e) | nom::Err::Failure(e)) => Err(Error::ParseError(e)),
Err(nom::Err::Error(e) | nom::Err::Failure(e)) => Err(Error::Parser(e)),
}
}

4
tvix/nix-compat/src/derivation/tests/mod.rs
View file

@ -1,7 +1,7 @@
use super::parse_error::ErrorKind;
use crate::derivation::output::Output;
use crate::derivation::parse_error::NomError;
use crate::derivation::parser::Error::ParseError;
use crate::derivation::parser::Error;
use crate::derivation::Derivation;
use crate::store_path::StorePath;
use bstr::{BStr, BString};
@ -116,7 +116,7 @@ fn from_aterm_bytes_duplicate_map_key() {
let err = Derivation::from_aterm_bytes(&buf).expect_err("must fail");
match err {
ParseError(NomError { input: _, code }) => {
Error::Parser(NomError { input: _, code }) => {
assert_eq!(code, ErrorKind::DuplicateMapKey("name".to_string()));
}
_ => {