Refactoring

fglab-tech · Jun 29, 2024 · 75375c0 · 75375c0
1 parent 636fa25
commit 75375c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/crates/benda/src/types/fan.rs b/crates/benda/src/types/fan.rs
@@ -1,6 +1,6 @@
 use bend::fun::Term;
-use pyo3::types::{PyString, PyTuple, PyTupleMethods};
-use pyo3::{pyclass, pymethods, Bound, Py, PyAny};
+use pyo3::types::{PyTuple, PyTupleMethods};
+use pyo3::{pyclass, pymethods, Bound};
 
 use crate::types::extract_type_raw;
 

diff --git a/crates/benda/src/types/mod.rs b/crates/benda/src/types/mod.rs
@@ -139,6 +139,7 @@ pub fn extract_type_expr(call: ExprCall) -> Option<imp::Expr> {
 pub enum BuiltinType {
     U24,
     F32,
+    #[allow(dead_code)]
     I32,
     Tree,
     Leaf,

diff --git a/crates/benda/src/types/user_adt.rs b/crates/benda/src/types/user_adt.rs
@@ -86,31 +86,15 @@ pub fn from_term_into_adt(term: &BTerm, def_adts: &Ctrs) -> Option<TermParse> {
             if let (BTerm::Var { nam: _ }, BTerm::Num { val }) =
                 (fun.as_ref(), arg.as_ref())
             {
-                let mut constructor: Option<Box<dyn BendCtr>> = None;
-                match num_to_i32(val) {
-                    0 => {
-                        constructor =
-                            Some(Box::new(def_adts.first.clone().unwrap()));
-                    }
-                    1 => {
-                        constructor =
-                            Some(Box::new(def_adts.second.clone().unwrap()));
-                    }
-                    2 => {
-                        constructor =
-                            Some(Box::new(def_adts.third.clone().unwrap()));
-                    }
-                    3 => {
-                        constructor =
-                            Some(Box::new(def_adts.fourth.clone().unwrap()));
-                    }
-                    4 => {
-                        constructor =
-                            Some(Box::new(def_adts.fifth.clone().unwrap()));
-                    }
-
-                    _ => panic!("ADT has more than 5 Ctrs"),
-                };
+                let constructor: Option<Box<dyn BendCtr>> =
+                    match num_to_i32(val) {
+                        0 => Some(Box::new(def_adts.first.clone().unwrap())),
+                        1 => Some(Box::new(def_adts.second.clone().unwrap())),
+                        2 => Some(Box::new(def_adts.third.clone().unwrap())),
+                        3 => Some(Box::new(def_adts.fourth.clone().unwrap())),
+                        4 => Some(Box::new(def_adts.fifth.clone().unwrap())),
+                        _ => panic!("ADT has more than 5 Ctrs"),
+                    };
 
                 return Some(TermParse::Ctr(constructor.unwrap()));
             }