chore: align 'app' and 'lib' crates imports.

This is done one-time (for now) using a nightly feature of cargo-fmt
as defined in `rustfmt-nightly.toml.`

It's planned to make this the default so imports will always be sorted.
For now it can be run manually with:

    cargo +nightly fmt -- --config-path rustfmt-nightly.toml

or

    pnpm rustfmt

Author: Byron

crates/gitbutler-app/src/analytics.rs

@@ -1,8 +1,7 @@
 use std::{fmt, str, sync::Arc};
 
-use tauri::AppHandle;
-
 use gitbutler::{projects::ProjectId, users::User};
+use tauri::AppHandle;
 
 mod posthog;
 

crates/gitbutler-app/src/analytics/posthog/retry.rs

@@ -40,11 +40,9 @@ impl<T: super::Client + Sync> super::Client for Client<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
-    use super::super::Client;
+    use super::{super::Client, *};
 
     #[derive(Clone)]
     struct MockClient {

crates/gitbutler-app/src/app.rs

@@ -1,8 +1,6 @@
 use std::{collections::HashMap, path};
 
 use anyhow::{Context, Result};
-
-use crate::watcher;
 use gitbutler::{
     askpass::AskpassBroker,
     gb_repository, git,
@@ -14,6 +12,8 @@ use gitbutler::{
     virtual_branches::BranchId,
 };
 
+use crate::watcher;
+
 #[derive(Clone)]
 pub struct App {
     local_data_dir: path::PathBuf,

crates/gitbutler-app/src/commands.rs

@@ -1,16 +1,16 @@
 use std::{collections::HashMap, path};
 
 use anyhow::Context;
-use tauri::Manager;
-use tracing::instrument;
-
-use crate::{app, watcher};
 use gitbutler::{
     error::{Code, Error},
     gb_repository, git, project_repository, projects, reader,
     sessions::SessionId,
     users,
 };
+use tauri::Manager;
+use tracing::instrument;
+
+use crate::{app, watcher};
 
 impl From<app::Error> for Error {
     fn from(value: app::Error) -> Self {

crates/gitbutler-app/src/deltas.rs

@@ -1,13 +1,12 @@
 pub mod commands {
     use std::collections::HashMap;
 
+    use gitbutler::deltas::{controller::ListError, Controller, Delta};
     use tauri::{AppHandle, Manager};
     use tracing::instrument;
 
     use crate::error::{Code, Error};
 
-    use gitbutler::deltas::{controller::ListError, Controller, Delta};
-
     impl From<ListError> for Error {
         fn from(value: ListError) -> Self {
             match value {

crates/gitbutler-app/src/error.rs

@@ -9,10 +9,12 @@ pub(crate) mod gb {
 
     #[cfg(feature = "error-context")]
     mod error_context {
-        use super::{ErrorKind, Result, WithContext};
-        use backtrace::Backtrace;
         use std::collections::BTreeMap;
 
+        use backtrace::Backtrace;
+
+        use super::{ErrorKind, Result, WithContext};
+
         #[derive(Debug)]
         pub struct Context {
             pub backtrace: Backtrace,

crates/gitbutler-app/src/error/sentry.rs

@@ -1,9 +1,11 @@
-use crate::error::gb::{ErrorCode, ErrorContext};
+use std::collections::BTreeMap;
+
 use sentry::{
     protocol::{value::Map, Event, Exception, Value},
     types::Uuid,
 };
-use std::collections::BTreeMap;
+
+use crate::error::gb::{ErrorCode, ErrorContext};
 
 pub trait SentrySender {
     fn send_to_sentry(self) -> Uuid;

crates/gitbutler-app/src/events.rs

@@ -1,13 +1,12 @@
 use anyhow::{Context, Result};
-use tauri::{AppHandle, Manager};
-
 use gitbutler::{
     deltas,
     projects::ProjectId,
     reader,
     sessions::{self, SessionId},
     virtual_branches,
 };
+use tauri::{AppHandle, Manager};
 
 #[derive(Clone)]
 pub struct Sender {

crates/gitbutler-app/src/keys.rs

@@ -1,11 +1,10 @@
 pub mod commands {
+    use gitbutler::keys::{controller, PublicKey};
     use tauri::Manager;
     use tracing::instrument;
 
     use crate::error::Error;
 
-    use gitbutler::keys::{controller, PublicKey};
-
     impl From<controller::GetOrCreateError> for Error {
         fn from(value: controller::GetOrCreateError) -> Self {
             match value {

crates/gitbutler-app/src/main.rs

@@ -13,34 +13,17 @@
     clippy::too_many_lines
 )]
 
-use gitbutler::assets;
-use gitbutler::database;
-use gitbutler::git;
-use gitbutler::storage;
-#[cfg(target_os = "windows")]
-use gitbutler::windows;
-use gitbutler_app::analytics;
-use gitbutler_app::app;
-use gitbutler_app::askpass;
-use gitbutler_app::commands;
-use gitbutler_app::deltas;
-use gitbutler_app::github;
-use gitbutler_app::keys;
-use gitbutler_app::logs;
-use gitbutler_app::menu;
-use gitbutler_app::projects;
-use gitbutler_app::sentry;
-use gitbutler_app::sessions;
-use gitbutler_app::users;
-use gitbutler_app::virtual_branches;
-use gitbutler_app::watcher;
-use gitbutler_app::zip;
-
 use std::path::PathBuf;
 
 use anyhow::Context;
+#[cfg(target_os = "windows")]
+use gitbutler::windows;
+use gitbutler::{assets, database, git, storage};
+use gitbutler_app::{
+    analytics, app, askpass, commands, deltas, github, keys, logs, menu, projects, sentry,
+    sessions, users, virtual_branches, watcher, zip,
+};
 use tauri::{generate_context, Manager, Wry};
-
 use tauri_plugin_log::LogTarget;
 use tauri_plugin_store::{with_store, JsonValue, StoreCollection};
 

crates/gitbutler-app/src/projects.rs

@@ -1,15 +1,14 @@
 pub mod commands {
     use std::path;
 
-    use tauri::Manager;
-    use tracing::instrument;
-
-    use crate::error::{Code, Error};
-
     use gitbutler::projects::{
         self,
         controller::{self, Controller},
     };
+    use tauri::Manager;
+    use tracing::instrument;
+
+    use crate::error::{Code, Error};
 
     impl From<controller::UpdateError> for Error {
         fn from(value: controller::UpdateError) -> Self {

crates/gitbutler-app/src/sentry.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use gitbutler::users;
 use governor::{
     clock::QuantaClock,
     state::{InMemoryState, NotKeyed},
@@ -12,8 +13,6 @@ use sentry_tracing::SentryLayer;
 use tracing::Subscriber;
 use tracing_subscriber::registry::LookupSpan;
 
-use gitbutler::users;
-
 static SENTRY_QUOTA: Quota = Quota::per_second(nonzero!(1_u32)); // 1 per second at most.
 static SENTRY_LIMIT: OnceCell<RateLimiter<NotKeyed, InMemoryState, QuantaClock>> = OnceCell::new();
 

crates/gitbutler-app/src/sessions.rs

@@ -1,14 +1,10 @@
 pub mod commands {
+    use gitbutler::sessions::{controller::ListError, Controller, Session};
     use tauri::{AppHandle, Manager};
     use tracing::instrument;
 
     use crate::error::{Code, Error};
 
-    use gitbutler::sessions::{
-        Session,
-        {controller::ListError, Controller},
-    };
-
     impl From<ListError> for Error {
         fn from(value: ListError) -> Self {
             match value {

crates/gitbutler-app/src/users.rs

@@ -1,15 +1,16 @@
 pub mod commands {
+    use gitbutler::{
+        assets,
+        users::{
+            controller::{self, Controller, GetError},
+            User,
+        },
+    };
     use tauri::{AppHandle, Manager};
     use tracing::instrument;
 
     use crate::{error::Error, sentry};
 
-    use gitbutler::{
-        assets,
-        users::controller::{self, Controller, GetError},
-        users::User,
-    };
-
     impl From<GetError> for Error {
         fn from(value: GetError) -> Self {
             match value {

crates/gitbutler-app/src/virtual_branches.rs

@@ -1,21 +1,21 @@
 pub mod commands {
     use anyhow::Context;
+    use gitbutler::{
+        askpass::AskpassBroker,
+        assets,
+        error::{Code, Error},
+        git, projects,
+        projects::ProjectId,
+        virtual_branches::{
+            branch::{self, BranchId, BranchOwnershipClaims},
+            controller::{Controller, ControllerError},
+            BaseBranch, RemoteBranch, RemoteBranchData, RemoteBranchFile, VirtualBranches,
+        },
+    };
     use tauri::{AppHandle, Manager};
     use tracing::instrument;
 
-    use gitbutler::error::{Code, Error};
-
     use crate::watcher;
-    use gitbutler::askpass::AskpassBroker;
-    use gitbutler::virtual_branches::{RemoteBranch, RemoteBranchData};
-    use gitbutler::{
-        assets, git, projects,
-        projects::ProjectId,
-        virtual_branches::branch::{self, BranchId, BranchOwnershipClaims},
-        virtual_branches::controller::{Controller, ControllerError},
-        virtual_branches::BaseBranch,
-        virtual_branches::{RemoteBranchFile, VirtualBranches},
-    };
 
     fn into_error<E: Into<Error>>(value: ControllerError<E>) -> Error {
         match value {

crates/gitbutler-app/src/watcher.rs

@@ -4,9 +4,9 @@ pub mod handlers;
 
 use std::{collections::HashMap, path, sync::Arc, time};
 
-pub use events::Event;
-
 use anyhow::{Context, Result};
+pub use events::Event;
+use gitbutler::projects::{self, Project, ProjectId};
 use tauri::AppHandle;
 use tokio::{
     sync::{
@@ -17,8 +17,6 @@ use tokio::{
 };
 use tokio_util::sync::CancellationToken;
 
-use gitbutler::projects::{self, Project, ProjectId};
-
 #[derive(Clone)]
 pub struct Watchers {
     app_handle: AppHandle,

crates/gitbutler-app/src/watcher/dispatchers.rs

@@ -3,15 +3,14 @@ mod file_change;
 use std::path;
 
 use anyhow::{Context, Result};
+use gitbutler::projects::ProjectId;
 use tokio::{
     select,
     sync::mpsc::{channel, Receiver},
     task,
 };
 use tokio_util::sync::CancellationToken;
 
-use gitbutler::projects::ProjectId;
-
 use super::events;
 
 #[derive(Clone)]

crates/gitbutler-app/src/watcher/dispatchers/file_change.rs

@@ -6,6 +6,7 @@ use std::{
 
 use anyhow::{Context, Result};
 use futures::executor::block_on;
+use gitbutler::{git, projects::ProjectId};
 use notify::{RecommendedWatcher, Watcher};
 use notify_debouncer_full::{new_debouncer, Debouncer, FileIdMap};
 use tokio::{
@@ -14,7 +15,6 @@ use tokio::{
 };
 
 use crate::watcher::events;
-use gitbutler::{git, projects::ProjectId};
 
 #[derive(Debug, Clone)]
 pub struct Dispatcher {

crates/gitbutler-app/src/watcher/handlers.rs

@@ -15,9 +15,8 @@ use anyhow::{Context, Result};
 use tauri::{AppHandle, Manager};
 use tracing::instrument;
 
-use crate::events as app_events;
-
 use super::events;
+use crate::events as app_events;
 
 #[derive(Clone)]
 pub struct Handler {

crates/gitbutler-app/src/watcher/handlers/analytics_handler.rs

@@ -1,10 +1,9 @@
 use anyhow::{Context, Result};
-use tauri::{AppHandle, Manager};
-
-use crate::analytics;
 use gitbutler::users;
+use tauri::{AppHandle, Manager};
 
 use super::events;
+use crate::analytics;
 
 #[derive(Clone)]
 pub struct Handler {

crates/gitbutler-app/src/watcher/handlers/calculate_deltas_handler.rs

@@ -1,13 +1,12 @@
 use std::{path, vec};
 
 use anyhow::{Context, Result};
-use tauri::{AppHandle, Manager};
-
 use gitbutler::{
     deltas, gb_repository, project_repository,
     projects::{self, ProjectId},
     reader, sessions, users,
 };
+use tauri::{AppHandle, Manager};
 
 use super::events;