s/get_mut_module/get_module_mut

Signed-off-by: he1pa <[email protected]>
kcl-lang · Oct 31, 2024 · c2a24f2 · c2a24f2
1 parent e579dbf
commit c2a24f2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/kclvm/ast/src/ast.rs b/kclvm/ast/src/ast.rs
@@ -462,7 +462,7 @@ impl Program {
         }
     }
 
-    pub fn get_mut_module(
+    pub fn get_module_mut(
         &self,
         module_path: &str,
     ) -> Result<Option<RwLockWriteGuard<'_, Module>>, &str> {

diff --git a/kclvm/parser/src/lib.rs b/kclvm/parser/src/lib.rs
@@ -979,7 +979,7 @@ pub fn parse_program(
 
     let mut modules: HashMap<String, Arc<RwLock<Module>>> = HashMap::new();
     for file in files.iter() {
-        let filename = file.canonicalize().to_str().unwrap().to_string();
+        let filename = file.path.adjust_canonicalization();
         let m_ref = match module_cache.read() {
             Ok(module_cache) => module_cache
                 .ast_cache

diff --git a/kclvm/query/src/override.rs b/kclvm/query/src/override.rs
@@ -48,7 +48,7 @@ pub fn apply_overrides(
         if let Some(modules) = prog.pkgs.get(MAIN_PKG) {
             for m in modules.iter() {
                 let mut m = prog
-                    .get_mut_module(m)
+                    .get_module_mut(m)
                     .expect("Failed to acquire module lock")
                     .expect(&format!("module {:?} not found in program", m));
                 if apply_override_on_module(&mut m, o, import_paths)? && print_ast {

diff --git a/kclvm/sema/src/pre_process/config.rs b/kclvm/sema/src/pre_process/config.rs
@@ -128,7 +128,7 @@ impl ConfigMergeTransformer {
         if let Some(modules) = program.pkgs.get(kclvm_ast::MAIN_PKG) {
             for (module_id, module) in modules.iter().enumerate() {
                 let mut module = program
-                    .get_mut_module(module)
+                    .get_module_mut(module)
                     .expect("Failed to acquire module lock")
                     .expect(&format!("module {:?} not found in program", module));
                 let filename = module.filename.to_string();
@@ -207,7 +207,7 @@ impl ConfigMergeTransformer {
                     if let Some(modules) = program.pkgs.get(kclvm_ast::MAIN_PKG) {
                         for (module_id, module) in modules.iter().enumerate() {
                             let mut module = program
-                                .get_mut_module(module)
+                                .get_module_mut(module)
                                 .expect("Failed to acquire module lock")
                                 .expect(&format!("module {:?} not found in program", module));
                             if &module.filename == merged_filename && module_id == *merged_id {
@@ -248,7 +248,7 @@ impl ConfigMergeTransformer {
                 if let Some(modules) = program.pkgs.get(kclvm_ast::MAIN_PKG) {
                     for (module_id, module) in modules.iter().enumerate() {
                         let mut module = program
-                            .get_mut_module(module)
+                            .get_module_mut(module)
                             .expect("Failed to acquire module lock")
                             .expect(&format!("module {:?} not found in program", module));
                         if &module.filename == filename && module_id == *merged_id {
@@ -292,7 +292,7 @@ impl ConfigMergeTransformer {
         if let Some(modules) = program.pkgs.get(kclvm_ast::MAIN_PKG) {
             for (i, module) in modules.iter().enumerate() {
                 let mut module = program
-                    .get_mut_module(module)
+                    .get_module_mut(module)
                     .expect("Failed to acquire module lock")
                     .expect(&format!("module {:?} not found in program", module));
                 let mut delete_index_set: IndexSet<usize> = IndexSet::default();

diff --git a/kclvm/sema/src/pre_process/mod.rs b/kclvm/sema/src/pre_process/mod.rs
@@ -36,7 +36,7 @@ pub fn pre_process_program(program: &mut ast::Program, opts: &Options) {
         }
         for module in modules.iter() {
             let mut module = program
-                .get_mut_module(module)
+                .get_module_mut(module)
                 .expect("Failed to acquire module lock")
                 .expect(&format!("module {:?} not found in program", module));
             if pkgpath != kclvm_ast::MAIN_PKG {

diff --git a/kclvm/sema/src/resolver/ty_alias.rs b/kclvm/sema/src/resolver/ty_alias.rs
@@ -149,7 +149,7 @@ pub fn type_alias_pass(
     for (pkgpath, modules) in program.pkgs.iter() {
         for module in modules.iter() {
             let mut module = program
-                .get_mut_module(module)
+                .get_module_mut(module)
                 .expect("Failed to acquire module lock")
                 .expect(&format!("module {:?} not found in program", module));
             if let Some(type_alias_mapping) = type_alias_mapping.get(pkgpath) {

diff --git a/kclvm/sema/src/resolver/ty_erasure.rs b/kclvm/sema/src/resolver/ty_erasure.rs
@@ -69,7 +69,7 @@ pub fn type_func_erasure_pass<'ctx>(program: &'ctx mut ast::Program) {
     for (_, modules) in program.pkgs.iter() {
         for module in modules.iter() {
             let mut module = program
-                .get_mut_module(module)
+                .get_module_mut(module)
                 .expect("Failed to acquire module lock")
                 .expect(&format!("module {:?} not found in program", module));
             TypeErasureTransformer::default().walk_module(&mut module);

diff --git a/kclvm/tools/src/vet/validator.rs b/kclvm/tools/src/vet/validator.rs
@@ -212,7 +212,7 @@ pub fn validate(val_opt: ValidateOption) -> Result<bool> {
             if let Some(module) = pkg.first() {
                 let mut m = compile_res
                     .program
-                    .get_mut_module(module)
+                    .get_module_mut(module)
                     .expect("Failed to acquire module lock")
                     .expect(&format!("module {:?} not found in program", module));
                 m.body.insert(0, assign_stmt);