Fix import_cmd.rs compile error

crates/dwell-cli/src/commands.rs

@@ -5,8 +5,8 @@ mod apply;
 mod deploy;
 mod deps;
 mod diff;
-mod init;
 mod import_cmd;
+mod init;
 mod module_cmd;
 mod package;
 mod reset;
@@ -79,7 +79,9 @@ pub fn run(cli: Cli) -> dwell_core::Result<()> {
             Ok(())
         }
         crate::Commands::Module { action } => module_cmd::run(&cli_ref, &cfg, action),
-        crate::Commands::Import { url, all, dry_run } => import_cmd::run(&cli_ref, &cfg, url, all, dry_run),
+        crate::Commands::Import { url, all, dry_run } => {
+            import_cmd::run(&cli_ref, &cfg, url, all, dry_run)
+        }
         crate::Commands::Plugin { .. } => {
             eprintln!("Plugin management — Phase 4 (coming soon)");
             Ok(())

crates/dwell-cli/src/commands/import_cmd.rs

@@ -1,28 +1,68 @@
-use std::path::Path;
 use std::fs;
+use std::path::Path;
 
 use crate::commands::CliRef;
 use crate::output::Output;
 
 /// Known config directory names commonly found in dotfiles repos.
 const CONFIG_DIRS: &[&str] = &[
-    "ags", "alacritty", "btop", "cava", "dunst", "fastfetch", "fish",
-    "foot", "gtk-2.0", "gtk-3.0", "gtk-4.0", "hypr", "i3", "k9s",
-    "kitty", "Kvantum", "mako", "mpd", "mpv", "neofetch", "nvim",
-    "oh-my-posh", "picom", "polybar", "qtile", "ranger", "rofi",
-    "starship", "sway", "swaylock", "tmux", "waybar", "wlogout",
-    "wofi", "xfce4", "yazi", "zathura",
+    "ags",
+    "alacritty",
+    "btop",
+    "cava",
+    "dunst",
+    "fastfetch",
+    "fish",
+    "foot",
+    "gtk-2.0",
+    "gtk-3.0",
+    "gtk-4.0",
+    "hypr",
+    "i3",
+    "k9s",
+    "kitty",
+    "Kvantum",
+    "mako",
+    "mpd",
+    "mpv",
+    "neofetch",
+    "nvim",
+    "oh-my-posh",
+    "picom",
+    "polybar",
+    "qtile",
+    "ranger",
+    "rofi",
+    "starship",
+    "sway",
+    "swaylock",
+    "tmux",
+    "waybar",
+    "wlogout",
+    "wofi",
+    "xfce4",
+    "yazi",
+    "zathura",
 ];
 
 /// Directories to skip (wallpapers, backgrounds, large media, version control).
 const SKIP_DIRS: &[&str] = &[
-    "backgrounds", "wallpapers", "wallpaper", "wall", "Pictures",
-    "Screenshots", "previews", ".git", ".github", ".previews",
+    "backgrounds",
+    "wallpapers",
+    "wallpaper",
+    "wall",
+    "Pictures",
+    "Screenshots",
+    "previews",
+    ".git",
+    ".github",
+    ".previews",
 ];
 
 /// File patterns at repo root that look like home-relative dotfiles.
 fn is_home_dotfile(name: &str) -> bool {
-    name.starts_with('.') && !name.starts_with(".git")
+    name.starts_with('.')
+        && !name.starts_with(".git")
         && !name.starts_with(".github")
         && !name.starts_with(".previews")
 }
@@ -34,15 +74,16 @@ pub fn run(
     all: bool,
     dry_run: bool,
 ) -> dwell_core::Result<()> {
-    let out = Output::new(cli.json, cli.verbose, cli.quiet);
+    let out = Output::new(cli.json, cli.verbose, cli.quiet, None);
     let source_dir = crate::commands::resolve_source(cli, None)?;
 
     out.title(&format!("Importing: {}", url));
 
     // Extract repo name from URL
-    let repo_name = url.trim_end_matches(".git")
+    let repo_name = url
+        .trim_end_matches(".git")
         .split('/')
-        .last()
+        .next_back()
         .unwrap_or("dotfiles")
         .to_string();
 
@@ -52,7 +93,7 @@ pub fn run(
         fs::remove_dir_all(&tmp_dir).ok();
     }
 
-    out.info(&format!("Cloning into temporary directory..."));
+    out.info("Cloning into temporary directory...");
     let status = std::process::Command::new("git")
         .args(["clone", "--depth", "1", &url, tmp_dir.to_str().unwrap()])
         .status()
@@ -98,14 +139,12 @@ pub fn run(
         let src = tmp_dir.join(&c.repo_path);
         let dst = source_dir.join(&c.dwell_path);
 
-        if dst.exists() {
-            if !all {
-                out.info(&format!("Skipping existing: {}", &c.dwell_path));
-                skipped += 1;
-                continue;
-            }
-            // When --all, overwrite
+        if dst.exists() && !all {
+            out.info(&format!("Skipping existing: {}", c.dwell_path));
+            skipped += 1;
+            continue;
         }
+        // When --all, overwrite
 
         if let Some(parent) = dst.parent() {
             fs::create_dir_all(parent).ok();
@@ -114,12 +153,12 @@ pub fn run(
         match fs::copy(&src, &dst) {
             Ok(_) => {
                 if cli.verbose > 0 {
-                    out.success(&format!("  {}", &c.dwell_path));
+                    out.success(&format!("  {}", c.dwell_path));
                 }
                 copied += 1;
             }
             Err(e) => {
-                out.warn(&format!("  Failed: {}: {}", &c.dwell_path, e));
+                out.warn(&format!("  Failed: {}: {}", c.dwell_path, e));
             }
         }
     }
@@ -141,7 +180,7 @@ pub fn run(
     fs::remove_dir_all(&tmp_dir).ok();
 
     // Summary
-    out.info(&format!("Run 'dwell apply' to deploy, or 'dwell diff' to preview"));
+    out.info("Run 'dwell apply' to deploy, or 'dwell diff' to preview");
     Ok(())
 }
 
@@ -185,7 +224,12 @@ fn detect_structure(repo_root: &Path) -> RepoStructure {
 
     let has_dotfiles_dir = repo_root.join("dotfiles").is_dir();
 
-    match (has_config_subdirs, has_home_configs_dir, has_dotfiles_dir, has_dotfiles_at_root) {
+    match (
+        has_config_subdirs,
+        has_home_configs_dir,
+        has_dotfiles_dir,
+        has_dotfiles_at_root,
+    ) {
         (true, _, _, _) => RepoStructure::DirectConfig,
         (_, true, _, _) => RepoStructure::HomeConfigsDir,
         (_, _, true, _) => RepoStructure::DotfilesDir,
@@ -202,9 +246,17 @@ fn detect_structure(repo_root: &Path) -> RepoStructure {
 }
 
 fn has_config_looking_dirs(repo_root: &Path) -> bool {
-    fs::read_dir(repo_root).ok().map(|entries| {
-        entries.filter_map(|e| e.ok()).filter(|e| e.file_type().map(|t| t.is_dir()).unwrap_or(false)).take(10).count()
-    }).unwrap_or(0) > 2
+    fs::read_dir(repo_root)
+        .ok()
+        .map(|entries| {
+            entries
+                .filter_map(|e| e.ok())
+                .filter(|e| e.file_type().map(|t| t.is_dir()).unwrap_or(false))
+                .take(10)
+                .count()
+        })
+        .unwrap_or(0)
+        > 2
 }
 
 #[derive(Debug)]
@@ -224,7 +276,11 @@ fn discover_files(repo_root: &Path, structure: &RepoStructure, _all: bool) -> Ve
                 if dir_path.is_dir() {
                     // Check for doubled dir: name/name/
                     let doubled = dir_path.join(dir);
-                    let source_dir = if doubled.is_dir() { &doubled } else { &dir_path };
+                    let source_dir = if doubled.is_dir() {
+                        &doubled
+                    } else {
+                        &dir_path
+                    };
                     collect_dir(source_dir, &format!("dot_config/{}", dir), &mut candidates);
                 }
             }
@@ -237,7 +293,11 @@ fn discover_files(repo_root: &Path, structure: &RepoStructure, _all: bool) -> Ve
                         && !SKIP_DIRS.contains(&name.as_str())
                         && !CONFIG_DIRS.contains(&name.as_str())
                     {
-                        collect_dir(&entry.path(), &format!("dot_config/{}", name), &mut candidates);
+                        collect_dir(
+                            &entry.path(),
+                            &format!("dot_config/{}", name),
+                            &mut candidates,
+                        );
                     }
                 }
             }
@@ -277,7 +337,9 @@ fn discover_files(repo_root: &Path, structure: &RepoStructure, _all: bool) -> Ve
             if let Ok(entries) = fs::read_dir(repo_root) {
                 for entry in entries.flatten() {
                     let name = entry.file_name().to_string_lossy().to_string();
-                    if entry.file_type().map(|t| t.is_file()).unwrap_or(false) && is_home_dotfile(&name) {
+                    if entry.file_type().map(|t| t.is_file()).unwrap_or(false)
+                        && is_home_dotfile(&name)
+                    {
                         // .zshrc → dot_zshrc
                         let dwell_name = format!("dot_{}", &name[1..]);
                         candidates.push(ImportCandidate {

crates/dwell-cli/src/main.rs

@@ -351,11 +351,18 @@ fn main() {
     // Determine log level
     let level = cli.log_level.clone().unwrap_or_else(|| {
         match cli.verbose {
-            0 => if cli.quiet { "error" } else { "warn" },
+            0 => {
+                if cli.quiet {
+                    "error"
+                } else {
+                    "warn"
+                }
+            }
             1 => "info",
             2 => "debug",
             _ => "trace",
-        }.to_string()
+        }
+        .to_string()
     });
 
     // Configure tracing subscriber with optional file output
@@ -371,7 +378,11 @@ fn main() {
             .append(true)
             .open(log_path)
             .unwrap_or_else(|e| {
-                eprintln!("dwell: warning: cannot open log file {}: {}", log_path.display(), e);
+                eprintln!(
+                    "dwell: warning: cannot open log file {}: {}",
+                    log_path.display(),
+                    e
+                );
                 // Fallback to stderr using /dev/null as a dummy that won't matter
                 std::fs::File::create("/dev/null").unwrap()
             });