chore: Removed unwrap custom functions in favor of From trait

Author: ngeor

rusty_basic/src/instruction_generator/instruction_generator.rs

@@ -15,8 +15,8 @@ use rusty_parser::{BuiltInFunction, UserDefinedTypes};
 use rusty_variant::Variant;
 
 pub fn unwrap_linter_context(linter_context: Context) -> (Names, UserDefinedTypes) {
-    let (pre_linter_result, _, linter_names) = linter_context.unwrap();
-    let (_, _, user_defined_types) = pre_linter_result.unwrap();
+    let (pre_linter_result, linter_names) = linter_context.into();
+    let user_defined_types = pre_linter_result.into();
     (linter_names, user_defined_types)
 }
 

rusty_linter/src/converter/common/context.rs

@@ -43,10 +43,6 @@ impl Context {
         }
     }
 
-    pub fn unwrap(self) -> (PreLinterResult, TypeResolverImpl, Names) {
-        (self.pre_linter_result, self.resolver, self.names)
-    }
-
     pub fn is_in_subprogram(&self) -> bool {
         self.names.is_in_subprogram()
     }
@@ -59,3 +55,9 @@ impl Context {
             .and_then(|function_signature_pos| function_signature_pos.element.qualifier())
     }
 }
+
+impl From<Context> for (PreLinterResult, Names) {
+    fn from(value: Context) -> Self {
+        (value.pre_linter_result, value.names)
+    }
+}

rusty_linter/src/pre_linter/pre_linter_result.rs

@@ -24,9 +24,11 @@ impl PreLinterResult {
             user_defined_types,
         }
     }
+}
 
-    pub fn unwrap(self) -> (SignatureMap, SignatureMap, UserDefinedTypes) {
-        (self.functions, self.subs, self.user_defined_types)
+impl From<PreLinterResult> for UserDefinedTypes {
+    fn from(value: PreLinterResult) -> Self {
+        value.user_defined_types
     }
 }