From 3a9c17e68ff56ae74de36831f60b794ecba7bec5 Mon Sep 17 00:00:00 2001 From: Ada Bohm Date: Fri, 6 Mar 2026 16:44:19 +0100 Subject: [PATCH] Fix clippy warning on rustc 1.94.0 --- crates/hyperqueue/src/common/parser2.rs | 20 ++++++++++++------- .../src/server/autoalloc/service.rs | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/crates/hyperqueue/src/common/parser2.rs b/crates/hyperqueue/src/common/parser2.rs index 366388a0d..fe2969bc5 100644 --- a/crates/hyperqueue/src/common/parser2.rs +++ b/crates/hyperqueue/src/common/parser2.rs @@ -9,14 +9,14 @@ use tako::resources::{FRACTIONS_MAX_DIGITS, ResourceAmount}; #[derive(Clone, Debug, PartialEq)] pub struct ParseError { - error: Simple, + error: Box>, } impl ParseError { /// Create an error with a custom error message. pub fn custom(span: >::Span, msg: M) -> Self { Self { - error: Simple::custom(span, msg), + error: Box::new(Simple::custom(span, msg)), } } @@ -26,7 +26,7 @@ impl ParseError { found: Option, ) -> Self { Self { - error: Simple::expected_input_found(span, expected, found), + error: Box::new(Simple::expected_input_found(span, expected, found)), } } @@ -67,19 +67,25 @@ impl Error for ParseError { ) -> Self { let expected = expected.into_iter().map(|c| c.map(|c| c.to_string())); Self { - error: Simple::expected_input_found(span, expected, found.map(|c| c.to_string())), + error: Box::new(Simple::expected_input_found( + span, + expected, + found.map(|c| c.to_string()), + )), } } fn with_label(self, label: Self::Label) -> Self { Self { - error: self.error.with_label(label), + error: Box::new(self.error.with_label(label)), } } fn merge(self, other: Self) -> Self { - let merged = self.error.merge(other.error); - Self { error: merged } + let merged = self.error.merge(*other.error); + Self { + error: Box::new(merged), + } } } diff --git a/crates/hyperqueue/src/server/autoalloc/service.rs b/crates/hyperqueue/src/server/autoalloc/service.rs index 24427d009..1f0818afa 100644 --- a/crates/hyperqueue/src/server/autoalloc/service.rs +++ b/crates/hyperqueue/src/server/autoalloc/service.rs @@ -1,3 +1,6 @@ +// SendError is large but that is acceptable here. +#![allow(clippy::result_large_err)] + use std::future::Future; use std::path::{Path, PathBuf}; use std::time::Duration;