panic => expect (*2)

CQCL · Sep 5, 2023 · 2a7d49b · 2a7d49b
1 parent 9132e43
commit 2a7d49b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/types/custom.rs b/src/types/custom.rs
@@ -89,7 +89,10 @@ impl CustomType {
     }
 
     pub(super) fn substitute(&self, exts: &ExtensionRegistry, args: &[TypeArg]) -> Self {
-        let bound = self.get_type_def(exts).unwrap().bound(args);
+        let bound = self
+            .get_type_def(exts)
+            .expect("validate should rule this out")
+            .bound(args);
         assert!(self.bound.contains(bound));
         Self {
             args: self

diff --git a/src/types/type_param.rs b/src/types/type_param.rs
@@ -167,8 +167,10 @@ impl TypeArg {
                 TypeArg::Sequence(elems.iter().map(|ta| ta.substitute(exts, args)).collect())
             }
             TypeArg::Extensions(es) => TypeArg::Extensions(es.substitute(args)),
-            // Caller should already have checked arg against bound (cached here):
-            TypeArg::Variable(TypeArgVariable { idx, .. }) => args.get(*idx).unwrap().clone(),
+            TypeArg::Variable(TypeArgVariable { idx, .. }) => args
+                .get(*idx)
+                .expect("validate + check_type_args should rule this out")
+                .clone(),
         }
     }
 }