From 8347bd20b0bf44e2e78498c8ad9555b6c083136e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 2 Mar 2025 14:51:50 +0700 Subject: [PATCH] feat(nix-compat/derivation): use #[from] for Error::Parser Change-Id: Ic21142200d82d81dd3bc61d21bfa833e5ad88128 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13195 Reviewed-by: Brian Olsen Tested-by: BuildkiteCI --- tvix/nix-compat/src/derivation/parser.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tvix/nix-compat/src/derivation/parser.rs b/tvix/nix-compat/src/derivation/parser.rs index 668e90bd0..b15769c2c 100644 --- a/tvix/nix-compat/src/derivation/parser.rs +++ b/tvix/nix-compat/src/derivation/parser.rs @@ -20,7 +20,7 @@ use crate::{aterm, nixhash}; #[derive(Debug, thiserror::Error)] pub enum Error { #[error("parsing error: {0}")] - Parser(NomError), + Parser(#[from] NomError), #[error("premature EOF")] Incomplete, #[error("validation error: {0}")] @@ -39,7 +39,7 @@ pub(crate) fn parse(i: &[u8]) -> Result> { Ok(derivation) } Err(nom::Err::Incomplete(_)) => Err(Error::Incomplete), - Err(nom::Err::Error(e) | nom::Err::Failure(e)) => Err(Error::Parser(e)), + Err(nom::Err::Error(e) | nom::Err::Failure(e)) => Err(e.into()), } }