Minor code improvements

IsaacShelton · Dec 26, 2024 · cfd7b77 · cfd7b77
1 parent 09c9c57
commit cfd7b77
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 19 deletions.
diff --git a/src/ast/workspace/mod.rs b/src/ast/workspace/mod.rs
@@ -70,6 +70,10 @@ impl<'a> AstWorkspace<'a> {
         None
     }
 
+    pub fn get_owning_module_or_self(&self, fs_node_id: FsNodeId) -> FsNodeId {
+        self.get_owning_module(fs_node_id).unwrap_or(fs_node_id)
+    }
+
     pub fn get_mut(&mut self, id: FsNodeId) -> Option<&mut AstFile> {
         self.files.get_mut(&id)
     }

diff --git a/src/resolve/function_body.rs b/src/resolve/function_body.rs
@@ -16,9 +16,7 @@ pub fn resolve_function_bodies(
     while let Some(job) = ctx.jobs.pop_front() {
         match job {
             FuncJob::Regular(physical_file_id, ast_function_index, resolved_function_ref) => {
-                let module_file_id = ast_workspace
-                    .get_owning_module(physical_file_id)
-                    .unwrap_or(physical_file_id);
+                let module_file_id = ast_workspace.get_owning_module_or_self(physical_file_id);
 
                 let function_haystack = ctx
                     .function_haystacks

diff --git a/src/resolve/function_head.rs b/src/resolve/function_head.rs
@@ -21,9 +21,7 @@ pub fn create_function_heads<'a>(
     options: &BuildOptions,
 ) -> Result<(), ResolveError> {
     for (physical_file_id, file) in ast_workspace.files.iter() {
-        let module_file_id = ast_workspace
-            .get_owning_module(*physical_file_id)
-            .unwrap_or(*physical_file_id);
+        let module_file_id = ast_workspace.get_owning_module_or_self(*physical_file_id);
 
         for (function_i, function) in file.functions.iter().enumerate() {
             let name = ResolvedName::new(module_file_id, &Name::plain(&function.head.name));

diff --git a/src/resolve/global_variable.rs b/src/resolve/global_variable.rs
@@ -13,9 +13,7 @@ pub fn resolve_global_variables(
     let constraints = CurrentConstraints::new_empty(ctx.implementations);
 
     for (physical_file_id, file) in ast_workspace.files.iter() {
-        let module_file_id = ast_workspace
-            .get_owning_module(*physical_file_id)
-            .unwrap_or(*physical_file_id);
+        let module_file_id = ast_workspace.get_owning_module_or_self(*physical_file_id);
 
         for global in file.global_variables.iter() {
             let type_ctx = ResolveTypeCtx::new(

diff --git a/src/resolve/helper_expr.rs b/src/resolve/helper_expr.rs
@@ -16,10 +16,7 @@ pub fn resolve_helper_expressions(
     ast_workspace: &AstWorkspace,
 ) -> Result<(), ResolveError> {
     for (physical_file_id, file) in ast_workspace.files.iter() {
-        let module_file_id = ast_workspace
-            .get_owning_module(*physical_file_id)
-            .unwrap_or(*physical_file_id);
-
+        let module_file_id = ast_workspace.get_owning_module_or_self(*physical_file_id);
         let settings = &ast_workspace.settings[file.settings.unwrap_or_default().0];
 
         // NOTE: This module should already have a function haystack

diff --git a/src/resolve/type_definition/prepare.rs b/src/resolve/type_definition/prepare.rs
@@ -25,9 +25,7 @@ pub fn prepare_type_jobs(
     let mut type_jobs = Vec::with_capacity(ast_workspace.files.len());
 
     for (physical_file_id, file) in ast_workspace.files.iter() {
-        let module_fs_node_id = ast_workspace
-            .get_owning_module(*physical_file_id)
-            .unwrap_or(*physical_file_id);
+        let module_fs_node_id = ast_workspace.get_owning_module_or_self(*physical_file_id);
 
         let mut job = TypeJob {
             physical_file_id: *physical_file_id,

diff --git a/src/resolve/type_definition/resolve.rs b/src/resolve/type_definition/resolve.rs
@@ -29,9 +29,7 @@ pub fn resolve_type_jobs(
             .get(&job.physical_file_id)
             .expect("valid ast file");
 
-        let module_file_id = ast_workspace
-            .get_owning_module(job.physical_file_id)
-            .unwrap_or(job.physical_file_id);
+        let module_file_id = ast_workspace.get_owning_module_or_self(job.physical_file_id);
 
         for (trait_ref, user_trait) in job.traits.iter().zip(file.traits.iter()) {
             resolve_trait(