greptile fix and clippy fix

Author: xav-db

helix-cli/src/commands/integrations/helix.rs

@@ -86,7 +86,7 @@ impl<'a> HelixManager<'a> {
         let cluster_id = "YOUR_CLUSTER_ID".to_string();
 
         // Use provided region or default to us-east-1
-        let region = region.or_else(|| Some("us-east-1".to_string()));
+        let region = region.or(Some("us-east-1".to_string()));
 
         Ok(CloudInstanceConfig {
             cluster_id,
@@ -168,7 +168,7 @@ impl<'a> HelixManager<'a> {
         build_mode_override: Option<BuildMode>,
     ) -> Result<()> {
         let credentials = require_auth().await?;
-        let path = match get_path_or_cwd(path.as_ref()) {
+        let path = match get_path_or_cwd(path.as_deref()) {
             Ok(path) => path,
             Err(e) => {
                 return Err(eyre!("Error: failed to get path: {e}"));
@@ -553,7 +553,7 @@ impl<'a> HelixManager<'a> {
         config: &crate::config::EnterpriseInstanceConfig,
     ) -> Result<()> {
         let credentials = require_auth().await?;
-        let path = match get_path_or_cwd(path.as_ref()) {
+        let path = match get_path_or_cwd(path.as_deref()) {
             Ok(path) => path,
             Err(e) => {
                 return Err(eyre!("Error: failed to get path: {e}"));
@@ -568,8 +568,7 @@ impl<'a> HelixManager<'a> {
             for entry in std::fs::read_dir(&queries_dir)? {
                 let entry = entry?;
                 let file_path = entry.path();
-                if file_path.is_file() && file_path.extension().map(|e| e == "rs").unwrap_or(false)
-                {
+                if file_path.is_file() && file_path.extension().is_some_and(|e| e == "rs") {
                     let filename = file_path.file_name().unwrap().to_string_lossy().to_string();
                     let content = std::fs::read_to_string(&file_path)
                         .map_err(|e| eyre!("Failed to read {}: {}", filename, e))?;
@@ -710,7 +709,7 @@ impl<'a> HelixManager<'a> {
 }
 
 /// Returns the path or the current working directory if no path is provided
-pub fn get_path_or_cwd(path: Option<&String>) -> Result<PathBuf> {
+pub fn get_path_or_cwd(path: Option<&str>) -> Result<PathBuf> {
     match path {
         Some(p) => Ok(PathBuf::from(p)),
         None => Ok(env::current_dir()?),

helix-cli/src/commands/sync.rs

@@ -220,7 +220,7 @@ fn collect_local_hx_manifest(queries_dir: &Path) -> Result<HashMap<String, Manif
                 continue;
             }
 
-            let is_hx = path.extension().map(|ext| ext == "hx").unwrap_or(false);
+            let is_hx = path.extension().is_some_and(|ext| ext == "hx");
             if !is_hx {
                 continue;
             }
@@ -704,6 +704,17 @@ fn pull_remote_snapshot_into_local(
 
     let target_manifest = collect_local_hx_manifest(target_queries_dir)?;
 
+    fs::create_dir_all(target_queries_dir)?;
+
+    for (relative_path, remote_entry) in remote_manifest {
+        let destination = safe_join_relative(target_queries_dir, relative_path)?;
+        if let Some(parent) = destination.parent() {
+            fs::create_dir_all(parent)?;
+        }
+        fs::write(&destination, &remote_entry.content)
+            .map_err(|e| eyre!("Failed to write {}: {}", relative_path, e))?;
+    }
+
     for relative_path in local_manifest.keys() {
         let local_path = safe_join_relative(current_queries_dir, relative_path)?;
         if local_path.exists() {
@@ -725,17 +736,6 @@ fn pull_remote_snapshot_into_local(
         }
     }
 
-    fs::create_dir_all(target_queries_dir)?;
-
-    for (relative_path, remote_entry) in remote_manifest {
-        let destination = safe_join_relative(target_queries_dir, relative_path)?;
-        if let Some(parent) = destination.parent() {
-            fs::create_dir_all(parent)?;
-        }
-        fs::write(&destination, &remote_entry.content)
-            .map_err(|e| eyre!("Failed to write {}: {}", relative_path, e))?;
-    }
-
     Ok(())
 }
 
@@ -1745,17 +1745,14 @@ async fn run_project_sync_flow(project: &ProjectContext, assume_yes: bool) -> Re
             assume_yes,
         )
         .await?;
-        if let SyncReconciliationOutcome::Pulled = sync_outcome {
-            if project.config.project.queries != selected_queries_relative {
-                update_project_queries_path_in_helix_toml(
-                    &project.root,
-                    &selected_queries_relative,
-                )?;
-                Step::verbose_substep(&format!(
-                    "  Updated project queries path to {}",
-                    selected_queries_relative.display()
-                ));
-            }
+        if let SyncReconciliationOutcome::Pulled = sync_outcome
+            && project.config.project.queries != selected_queries_relative
+        {
+            update_project_queries_path_in_helix_toml(&project.root, &selected_queries_relative)?;
+            Step::verbose_substep(&format!(
+                "  Updated project queries path to {}",
+                selected_queries_relative.display()
+            ));
         }
     }
 
@@ -2176,17 +2173,17 @@ async fn pull_from_cloud_instance(
             )
             .await?;
 
-            if let SyncReconciliationOutcome::Pulled = sync_outcome {
-                if project.config.project.queries != selected_queries_relative {
-                    update_project_queries_path_in_helix_toml(
-                        &project.root,
-                        &selected_queries_relative,
-                    )?;
-                    Step::verbose_substep(&format!(
-                        "  Updated project queries path to {}",
-                        selected_queries_relative.display()
-                    ));
-                }
+            if let SyncReconciliationOutcome::Pulled = sync_outcome
+                && project.config.project.queries != selected_queries_relative
+            {
+                update_project_queries_path_in_helix_toml(
+                    &project.root,
+                    &selected_queries_relative,
+                )?;
+                Step::verbose_substep(&format!(
+                    "  Updated project queries path to {}",
+                    selected_queries_relative.display()
+                ));
             }
 
             reconcile_project_config_from_cloud(

helix-cli/src/config.rs

@@ -286,6 +286,7 @@ impl CloudInstanceConfig {
 }
 
 impl EnterpriseInstanceConfig {
+    #[allow(dead_code)]
     pub fn runtime_config(&self) -> RuntimeConfig {
         self.db_config.to_runtime_config()
     }