fix: box pragma returned in error

rigetti · Nov 1, 2024 · fd4c817 · fd4c817
1 parent 97cae32
commit fd4c817
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/quil-rs/src/instruction/extern_call.rs b/quil-rs/src/instruction/extern_call.rs
@@ -299,7 +299,7 @@ pub struct ExternSignatureMap(IndexMap<String, ExternSignature>);
 impl TryFrom<ExternPragmaMap> for ExternSignatureMap {
     /// The error type for converting an [`ExternPragmaMap`] to an [`ExternSignatureMap`] includes
     /// the offending [`Pragma`] instruction and the error that occurred.
-    type Error = (Pragma, ExternError);
+    type Error = (Box<Pragma>, ExternError);
 
     fn try_from(value: ExternPragmaMap) -> Result<Self, Self::Error> {
         Ok(ExternSignatureMap(
@@ -311,12 +311,12 @@ impl TryFrom<ExternPragmaMap> for ExternSignatureMap {
                         Some(name) => {
                             validate_user_identifier(name.as_str())
                                 .map_err(ExternError::from)
-                                .map_err(|error| (value.clone(), error))?;
+                                .map_err(|error| (Box::new(value.clone()), error))?;
                             let signature = ExternSignature::try_from(value.clone())
-                                .map_err(|error| (value, error))?;
+                                .map_err(|error| (Box::new(value), error))?;
                             Ok((name, signature))
                         }
-                        _ => Err((value, ExternError::NoName)),
+                        _ => Err((Box::new(value), ExternError::NoName)),
                     }
                 })
                 .collect::<Result<_, Self::Error>>()?,

diff --git a/quil-rs/src/program/mod.rs b/quil-rs/src/program/mod.rs
@@ -765,7 +765,7 @@ impl Program {
     /// with the offending [`Pragma`].
     pub fn try_extern_signature_map_from_pragma_map(
         &self,
-    ) -> std::result::Result<ExternSignatureMap, (Pragma, ExternError)> {
+    ) -> std::result::Result<ExternSignatureMap, (Box<Pragma>, ExternError)> {
         ExternSignatureMap::try_from(self.extern_pragma_map.clone())
     }
 }

diff --git a/quil-rs/src/program/scheduling/graph.rs b/quil-rs/src/program/scheduling/graph.rs
@@ -307,7 +307,7 @@ impl<'a> ScheduledBasicBlock<'a> {
         let extern_signature_map = ExternSignatureMap::try_from(program.extern_pragma_map.clone())
             .map_err(|(pragma, _)| ScheduleError {
                 instruction_index: None,
-                instruction: Instruction::Pragma(pragma),
+                instruction: Instruction::Pragma(*pragma),
                 variant: ScheduleErrorVariant::Extern,
             })?;
         for (index, &instruction) in basic_block.instructions().iter().enumerate() {