🎨 Reorganize import statements for consistent ordering

hyperb1iss · hyperb1iss · commit d3799cbdf713 · 2025-03-24T09:59:37.000-07:00
Normalize import statement ordering across the codebase

This stylistic change ensures a consistent pattern for import statements
throughout the project by:

- Grouping related imports together in a standardized order
- Placing crate imports before external dependencies in many modules
- Organizing alphabetically within import groups where appropriate
- Standardizing newline usage between import sections

These changes are purely cosmetic and don't alter functionality, but
improve code readability and maintainability by following Rust best
practices for import organization.
diff --git a/src/changes/common.rs b/src/changes/common.rs
@@ -7,8 +7,8 @@ use crate::git::GitRepo;
 use crate::llm;
 use crate::llm_providers::LLMProviderType;
 use anyhow::{Context, Result};
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use std::fmt::Debug;
 use std::sync::Arc;
 
diff --git a/src/changes/prompt.rs b/src/changes/prompt.rs
@@ -2,7 +2,7 @@ use super::{
     change_analyzer::AnalyzedChange,
     models::{ChangeMetrics, ChangelogResponse, ReleaseNotesResponse},
 };
-use crate::common::{get_combined_instructions, DetailLevel};
+use crate::common::{DetailLevel, get_combined_instructions};
 use crate::config::Config;
 use crate::gitmoji::get_gitmoji_list;
 use crate::log_debug;
diff --git a/src/commands.rs b/src/commands.rs
@@ -1,12 +1,12 @@
+use crate::ProviderConfig;
 use crate::common::CommonParams;
 use crate::config::Config;
 use crate::instruction_presets::get_instruction_preset_library;
 use crate::llm_providers::get_available_providers;
 use crate::log_debug;
 use crate::ui;
-use crate::ProviderConfig;
 use anyhow::Context;
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use colored::Colorize;
 use std::collections::HashMap;
 
@@ -21,8 +21,14 @@ pub fn handle_config_command(
     token_limit: Option<usize>,
     param: Option<Vec<String>>,
 ) -> anyhow::Result<()> {
-    log_debug!("Starting 'config' command with common: {:?}, api_key: {:?}, model: {:?}, token_limit: {:?}, param: {:?}",
-               common, api_key, model, token_limit, param);
+    log_debug!(
+        "Starting 'config' command with common: {:?}, api_key: {:?}, model: {:?}, token_limit: {:?}, param: {:?}",
+        common,
+        api_key,
+        model,
+        token_limit,
+        param
+    );
 
     let mut config = Config::load()?;
     common.apply_to_config(&mut config)?;
diff --git a/src/commit/mod.rs b/src/commit/mod.rs
@@ -6,8 +6,8 @@ pub mod prompt;
 pub mod service;
 
 pub use cli::handle_gen_command;
-pub use review::handle_review_command;
 use git2::FileMode;
+pub use review::handle_review_command;
 pub use service::IrisCommitService;
 
 use crate::git::CommitResult;
diff --git a/src/commit/review.rs b/src/commit/review.rs
@@ -5,15 +5,12 @@ use crate::llm_providers::LLMProviderType;
 use crate::messages;
 use crate::ui;
 use anyhow::{Context, Result};
+use colored::Colorize;
 use std::str::FromStr;
 use std::sync::Arc;
-use colored::Colorize;
 
 /// Handles the review command which generates an AI code review of staged changes
-pub async fn handle_review_command(
-    common: CommonParams,
-    print: bool,
-) -> Result<()> {
+pub async fn handle_review_command(common: CommonParams, print: bool) -> Result<()> {
     let mut config = Config::load()?;
     common.apply_to_config(&mut config)?;
     let current_dir = std::env::current_dir()?;
@@ -75,7 +72,11 @@ pub async fn handle_review_command(
         println!("\n{}", review.format());
     } else {
         // Add a fancy version header
-        println!("\n{} {}\n", "🔮".cyan(), "Git-Iris Code Review".bright_magenta().bold());
+        println!(
+            "\n{} {}\n",
+            "🔮".cyan(),
+            "Git-Iris Code Review".bright_magenta().bold()
+        );
         println!("{}", review.format());
     }
 
diff --git a/src/commit/service.rs b/src/commit/service.rs
@@ -1,14 +1,14 @@
 use anyhow::Result;
 use std::path::Path;
 use std::sync::Arc;
-use tokio::sync::{mpsc, RwLock};
+use tokio::sync::{RwLock, mpsc};
 
 use super::prompt::{create_system_prompt, create_user_prompt, process_commit_message};
 use crate::config::Config;
 use crate::context::{CommitContext, GeneratedMessage, GeneratedReview};
 use crate::git::{CommitResult, GitRepo};
 use crate::llm;
-use crate::llm_providers::{get_provider_metadata, LLMProviderType};
+use crate::llm_providers::{LLMProviderType, get_provider_metadata};
 use crate::log_debug;
 use crate::token_optimizer::TokenOptimizer;
 
@@ -175,17 +175,13 @@ impl IrisCommitService {
         config_clone.instructions = instructions.to_string();
 
         let context = self.get_git_info().await?;
-        
+
         // Create system prompt
         let system_prompt = create_system_prompt(&config_clone)?;
-        
+
         // Use the shared optimization logic
-        let (_, final_user_prompt) = self.optimize_prompt(
-            &config_clone,
-            &system_prompt,
-            context,
-            create_user_prompt,
-        );
+        let (_, final_user_prompt) =
+            self.optimize_prompt(&config_clone, &system_prompt, context, create_user_prompt);
 
         let mut generated_message = llm::get_refined_message::<GeneratedMessage>(
             &config_clone,
@@ -223,10 +219,10 @@ impl IrisCommitService {
         config_clone.instructions = instructions.to_string();
 
         let context = self.get_git_info().await?;
-        
+
         // Create system prompt
         let system_prompt = super::prompt::create_review_system_prompt(&config_clone)?;
-        
+
         // Use the shared optimization logic
         let (_, final_user_prompt) = self.optimize_prompt(
             &config_clone,
diff --git a/src/config.rs b/src/config.rs
@@ -1,11 +1,11 @@
 use crate::git::GitRepo;
 use crate::instruction_presets::get_instruction_preset_library;
 use crate::llm_providers::{
-    get_available_providers, get_provider_metadata, LLMProviderConfig, LLMProviderType,
+    LLMProviderConfig, LLMProviderType, get_available_providers, get_provider_metadata,
 };
 use crate::log_debug;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use dirs::config_dir;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
diff --git a/src/context.rs b/src/context.rs
@@ -1,9 +1,9 @@
 use crate::token_optimizer::TokenOptimizer;
+use colored::Colorize;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use textwrap::wrap;
-use colored::Colorize;
 
 #[derive(Serialize, Debug, Clone)]
 pub struct CommitContext {
@@ -195,13 +195,17 @@ impl GeneratedReview {
     pub fn format(&self) -> String {
         let mut formatted = String::new();
 
-        formatted.push_str(&format!("{}\n\n{}\n\n",
+        formatted.push_str(&format!(
+            "{}\n\n{}\n\n",
             "✨ Code Review Summary ✨".bright_magenta().bold(),
-            self.summary.bright_white()));
+            self.summary.bright_white()
+        ));
 
-        formatted.push_str(&format!("{}\n\n{}\n\n",
+        formatted.push_str(&format!(
+            "{}\n\n{}\n\n",
             "🔍 Code Quality Assessment".bright_cyan().bold(),
-            self.code_quality.bright_white()));
+            self.code_quality.bright_white()
+        ));
 
         if !self.positive_aspects.is_empty() {
             formatted.push_str(&format!("{}\n\n", "✅ Positive Aspects".green().bold()));
@@ -220,7 +224,10 @@ impl GeneratedReview {
         }
 
         if !self.suggestions.is_empty() {
-            formatted.push_str(&format!("{}\n\n", "💡 Suggestions for Improvement".bright_blue().bold()));
+            formatted.push_str(&format!(
+                "{}\n\n",
+                "💡 Suggestions for Improvement".bright_blue().bold()
+            ));
             for (i, suggestion) in self.suggestions.iter().enumerate() {
                 formatted.push_str(&format!("{}. {}\n", i + 1, suggestion.bright_blue()));
             }
diff --git a/src/git.rs b/src/git.rs
@@ -1,8 +1,8 @@
 use crate::config::Config;
 use crate::context::{ChangeType, CommitContext, ProjectMetadata, RecentCommit, StagedFile};
-use crate::file_analyzers::{self, should_exclude_file, FileAnalyzer};
+use crate::file_analyzers::{self, FileAnalyzer, should_exclude_file};
 use crate::log_debug;
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use futures::future::join_all;
 use git2::{DiffOptions, FileMode, Repository, Status, StatusOptions, Tree};
 use std::env;
diff --git a/src/llm_providers/test.rs b/src/llm_providers/test.rs
@@ -1,9 +1,9 @@
 use super::{LLMProvider, LLMProviderConfig, ProviderMetadata};
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use async_trait::async_trait;
 use std::sync::{
-    atomic::{AtomicU64, AtomicUsize, Ordering},
     Arc,
+    atomic::{AtomicU64, AtomicUsize, Ordering},
 };
 use std::time::Duration;
 use tokio::time::sleep;
diff --git a/src/tui/app.rs b/src/tui/app.rs
@@ -1,20 +1,20 @@
-use crate::commit::{format_commit_result, IrisCommitService};
+use crate::commit::{IrisCommitService, format_commit_result};
 use crate::context::GeneratedMessage;
 use crate::log_debug;
 use anyhow::{Error, Result};
 use crossterm::event::KeyEventKind;
+use ratatui::Terminal;
 use ratatui::backend::CrosstermBackend;
 use ratatui::crossterm::{
     event::{self, Event},
     execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
 };
-use ratatui::Terminal;
 use std::io;
 use std::sync::Arc;
 use std::time::Duration;
 
-use super::input_handler::{handle_input, InputResult};
+use super::input_handler::{InputResult, handle_input};
 use super::spinner::SpinnerState;
 use super::state::{EmojiMode, Mode, TuiState};
 use super::ui::draw_ui;
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
@@ -9,5 +9,5 @@ mod spinner;
 mod state;
 mod ui;
 
-pub use app::run_tui_commit;
 pub use app::TuiCommit;
+pub use app::run_tui_commit;
diff --git a/src/tui/spinner.rs b/src/tui/spinner.rs
@@ -1,5 +1,5 @@
-use crate::messages::get_waiting_message;
 use crate::messages::ColoredMessage;
+use crate::messages::get_waiting_message;
 use ratatui::style::Color;
 use unicode_width::UnicodeWidthStr;
 
diff --git a/src/tui/state.rs b/src/tui/state.rs
@@ -1,4 +1,4 @@
-use crate::context::{format_commit_message, GeneratedMessage};
+use crate::context::{GeneratedMessage, format_commit_message};
 use crate::gitmoji::get_gitmoji_list;
 use crate::instruction_presets::{get_instruction_preset_library, list_presets_formatted};
 use crate::messages::get_user_message;
diff --git a/src/tui/ui.rs b/src/tui/ui.rs
@@ -4,11 +4,11 @@ use crate::ui::{
     PLASMA_CYAN, SOLAR_YELLOW, STARLIGHT,
 };
 use ratatui::{
+    Frame,
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Clear, List, ListItem, Paragraph, Wrap},
-    Frame,
 };
 use unicode_width::UnicodeWidthStr;
 
diff --git a/tests/changelog_integration_tests.rs b/tests/changelog_integration_tests.rs
@@ -4,13 +4,13 @@
 
 use anyhow::Result;
 use dotenv::dotenv;
-use git2::Repository;
 use git_iris::changes::models::{ChangelogResponse, ReleaseNotesResponse};
 use git_iris::changes::{ChangelogGenerator, ReleaseNotesGenerator};
 use git_iris::common::DetailLevel;
 use git_iris::config::Config;
 use git_iris::llm_providers::LLMProviderType;
 use git_iris::logger;
+use git2::Repository;
 use std::env;
 use std::path::Path;
 use tempfile::TempDir;
diff --git a/tests/changelog_tests.rs b/tests/changelog_tests.rs
@@ -1,9 +1,9 @@
 use anyhow::Result;
-use git2::Repository;
 use git_iris::changes::models::{
     ChangeEntry, ChangeMetrics, ChangelogResponse, ChangelogType, ReleaseNotesResponse,
 };
 use git_iris::common::DetailLevel;
+use git2::Repository;
 
 use std::path::Path;
 use std::str::FromStr;
@@ -108,9 +108,11 @@ fn test_changelog_response_structure() {
     assert!(changelog_response.version.is_some());
     assert!(changelog_response.release_date.is_some());
     assert!(!changelog_response.sections.is_empty());
-    assert!(changelog_response
-        .sections
-        .contains_key(&ChangelogType::Added));
+    assert!(
+        changelog_response
+            .sections
+            .contains_key(&ChangelogType::Added)
+    );
     assert!(changelog_response.metrics.total_commits > 0);
     assert!(changelog_response.metrics.files_changed > 0);
 }
diff --git a/tests/file_analyzers_tests.rs b/tests/file_analyzers_tests.rs
@@ -168,9 +168,11 @@ fn test_json_analyzer() {
     let analysis = analyzer.analyze("test.json", &change);
     println!("JSON Test Debug: Analysis results: {analysis:?}");
 
-    assert!(analysis
-        .iter()
-        .any(|s| s.starts_with("Modified top-level keys:")));
+    assert!(
+        analysis
+            .iter()
+            .any(|s| s.starts_with("Modified top-level keys:"))
+    );
     assert!(analysis.contains(&"Array structures have been modified".to_string()));
     assert!(analysis.contains(&"Nested objects have been modified".to_string()));
 
@@ -398,9 +400,11 @@ fn test_c_analyzer() {
     let analysis = analyzer.analyze("test.c", &change);
     println!("C Test Debug: Analysis results: {analysis:?}");
     assert!(analysis.contains(&"Modified functions: new_function".to_string()));
-    assert!(analysis
-        .iter()
-        .any(|s| s.contains("OldStruct") && s.contains("NewStruct")));
+    assert!(
+        analysis
+            .iter()
+            .any(|s| s.contains("OldStruct") && s.contains("NewStruct"))
+    );
     assert!(analysis.contains(&"Include statements have been modified".to_string()));
 }
 
@@ -447,9 +451,11 @@ fn test_cpp_analyzer() {
     let analysis = analyzer.analyze("test.cpp", &change);
     println!("C++ Test Debug: Analysis results: {analysis:?}");
     assert!(analysis.contains(&"Modified functions: newFunction".to_string()));
-    assert!(analysis
-        .iter()
-        .any(|s| s.contains("OldClass") && s.contains("NewClass")));
+    assert!(
+        analysis
+            .iter()
+            .any(|s| s.contains("OldClass") && s.contains("NewClass"))
+    );
     assert!(analysis.contains(&"Include statements have been modified".to_string()));
 }
 
diff --git a/tests/git_hooks_tests.rs b/tests/git_hooks_tests.rs
@@ -1,8 +1,8 @@
 // only run this test on Linux
 #![cfg(target_os = "linux")]
 use anyhow::Result;
-use git2::Repository;
 use git_iris::git::GitRepo;
+use git2::Repository;
 use std::fs::{self, File};
 use std::io::Write;
 use std::os::unix::fs::PermissionsExt;
diff --git a/tests/git_tests.rs b/tests/git_tests.rs
diff --git a/tests/review_tests.rs b/tests/review_tests.rs
