Skip to content

Commit 1792a90

Browse files
committed
chore: clippy fixes
1 parent 978afc6 commit 1792a90

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

hugr-core/src/envelope.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ pub fn read_described_envelope(
147147
reader: impl BufRead,
148148
registry: &ExtensionRegistry,
149149
) -> Result<(PackageDesc, Package), ReadError> {
150-
let reader = EnvelopeReader::new(reader, registry)?;
150+
let reader = EnvelopeReader::new(reader, registry).map_err(Box::new)?;
151151
let (desc, res) = reader.read();
152152
match res {
153153
Ok(pkg) => Ok((desc, pkg)),
154154
Err(e) => Err(ReadError::Payload {
155-
source: e,
155+
source: Box::new(e),
156156
partial_description: desc,
157157
}),
158158
}
@@ -163,12 +163,12 @@ pub fn read_described_envelope(
163163
pub enum ReadError {
164164
/// Error reading the envelope header.
165165
#[error(transparent)]
166-
EnvelopeHeader(#[from] HeaderError),
166+
EnvelopeHeader(#[from] Box<HeaderError>),
167167
/// Error reading the package payload.
168168
#[error("Error reading package payload in envelope.")]
169169
Payload {
170170
/// The source error.
171-
source: PayloadError,
171+
source: Box<PayloadError>,
172172
/// Partial description of the envelope read before the error occurred.
173173
partial_description: PackageDesc,
174174
},
@@ -177,8 +177,8 @@ pub enum ReadError {
177177
impl From<ReadError> for EnvelopeError {
178178
fn from(err: ReadError) -> Self {
179179
match err {
180-
ReadError::EnvelopeHeader(e) => e.into(),
181-
ReadError::Payload { source, .. } => source.into(),
180+
ReadError::EnvelopeHeader(e) => (*e).into(),
181+
ReadError::Payload { source, .. } => (*source).into(),
182182
}
183183
}
184184
}

hugr-core/src/envelope/description.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ mod test {
461461
signature: Default::default(),
462462
}
463463
.into();
464-
empty_module_desc.set_entrypoint(node.clone(), optype.clone());
464+
empty_module_desc.set_entrypoint(node, optype.clone());
465465
assert_eq!(empty_module_desc.entrypoint.as_ref().unwrap().node, node);
466466
assert_eq!(
467467
empty_module_desc.entrypoint.as_ref().unwrap().optype,

hugr-core/src/envelope/reader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl<R: BufRead> EnvelopeReader<R> {
104104

105105
fn read_impl(&mut self) -> Result<Package, PayloadError> {
106106
let mut package = match self.header().format {
107-
EnvelopeFormat::PackageJson => self.from_json_reader()?,
107+
EnvelopeFormat::PackageJson => self.decode_json()?,
108108
EnvelopeFormat::Model | EnvelopeFormat::ModelWithExtensions => self.decode_model()?,
109109
EnvelopeFormat::ModelText | EnvelopeFormat::ModelTextWithExtensions => {
110110
self.decode_model_ast()?
@@ -143,7 +143,7 @@ impl<R: BufRead> EnvelopeReader<R> {
143143
/// Read a Package in json format from an io reader.
144144
/// Returns package and the combined extension registry
145145
/// of the provided registry and the package extensions.
146-
fn from_json_reader(&mut self) -> Result<Package, PackageEncodingError> {
146+
fn decode_json(&mut self) -> Result<Package, PackageEncodingError> {
147147
let val: serde_json::Value = serde_json::from_reader(&mut self.reader)?;
148148

149149
let super::package_json::PackageDeser {

0 commit comments

Comments
 (0)