Revert changes from initial approach

Author: GearsDatapacks

compiler-core/src/type_/environment.rs

@@ -162,16 +162,7 @@ impl Environment<'_> {
         // Process scope
         let result = process_scope(self, problems);
 
-        // We only check for unused entities if the scope was successfully
-        // processed. If it was not then any seemingly unused entities may have
-        // been used beyond the point where the error occurred, so we don't want
-        // to incorrectly warn about them.
-        let usage_tracking = if result.is_ok() {
-            UsageTracking::TrackUnused
-        } else {
-            UsageTracking::IgnoreUnused
-        };
-        self.close_scope(initial, usage_tracking, problems);
+        self.close_scope(initial, result.is_ok(), problems);
 
         // Return result of typing the scope
         result
@@ -186,15 +177,19 @@ impl Environment<'_> {
     pub fn close_scope(
         &mut self,
         data: ScopeResetData,
-        usage_tracking: UsageTracking,
+        was_successful: bool,
         problems: &mut Problems,
     ) {
         let unused = self
             .local_variable_usages
             .pop()
             .expect("There was no top entity scope.");
 
-        if let UsageTracking::TrackUnused = usage_tracking {
+        // We only check for unused entities if the scope was successfully
+        // processed. If it was not then any seemingly unused entities may have
+        // been used beyond the point where the error occurred, so we don't want
+        // to incorrectly warn about them.
+        if was_successful {
             self.handle_unused_variables(unused, problems);
         }
         self.scope = data.local_values;
@@ -794,12 +789,6 @@ pub enum Imported {
     Value(EcoString),
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum UsageTracking {
-    TrackUnused,
-    IgnoreUnused,
-}
-
 /// Unify two types that should be the same.
 /// Any unbound type variables will be linked to the other type as they are the same.
 ///

compiler-core/src/type_/expression.rs

@@ -378,14 +378,9 @@ impl<'a, 'b> ExprTyper<'a, 'b> {
         // Process the scope
         let (result, was_successful) = process_scope(self);
 
-        let usage_tracking = if was_successful {
-            UsageTracking::TrackUnused
-        } else {
-            UsageTracking::IgnoreUnused
-        };
         // Close scope, discarding any scope local state
         self.environment
-            .close_scope(environment_reset_data, usage_tracking, self.problems);
+            .close_scope(environment_reset_data, was_successful, self.problems);
         self.hydrator.close_scope(hydrator_reset_data);
         result
     }