refactor: clarify extend host method

Signed-off-by: Nathanael DEMACON <[email protected]>
quantumsheep · Feb 21, 2024 · 4731303 · 4731303
1 parent 126bb7a
commit 4731303
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ssh_config/host.rs b/src/ssh_config/host.rs
@@ -24,8 +24,11 @@ impl Host {
         self.entries.insert(entry.0, entry.1);
     }
 
-    pub(crate) fn extend(&mut self, host: &Host) {
+    pub(crate) fn extend_patterns(&mut self, host: &Host) {
         self.patterns.extend(host.patterns.clone());
+    }
+
+    pub(crate) fn extend_entries(&mut self, host: &Host) {
         self.entries.extend(host.entries.clone());
     }
 
@@ -108,7 +111,8 @@ impl HostVecExt for Vec<Host> {
                 }
 
                 let host = self[i].clone();
-                self[j].extend(&host);
+                self[j].extend_patterns(&host);
+                self[j].extend_entries(&host);
                 self.remove(i);
                 break;
             }

diff --git a/src/ssh_config/parser.rs b/src/ssh_config/parser.rs
@@ -96,7 +96,7 @@ impl Parser {
 
                     if hosts.is_empty() {
                         if !included_global_host.is_empty() {
-                            global_host.extend(&included_global_host);
+                            global_host.extend_entries(&included_global_host);
                         }
 
                         hosts.extend(included_hosts);
@@ -106,7 +106,7 @@ impl Parser {
                             return Err("Cannot include hosts inside a host block".into());
                         }
 
-                        hosts.last_mut().unwrap().extend(&included_global_host);
+                        hosts.last_mut().unwrap().extend_entries(&included_global_host);
                     }
 
                     continue;