UPDATE: cargo fmt

AidCheng · AidCheng · commit 33040a17336d · 2026-02-05T05:23:59.000Z
Signed-off-by: AidCheng &lt;cn.aiden.cheng@gmail.com&gt;
diff --git a/api-model/src/buck2/mod.rs b/api-model/src/buck2/mod.rs
@@ -1,4 +1,4 @@
 pub mod api;
+pub mod status;
 pub mod types;
 pub mod ws;
-pub mod status;
diff --git a/api-model/src/buck2/status.rs b/api-model/src/buck2/status.rs
@@ -11,10 +11,11 @@
 use std::{fs, path::Path};
 
 use anyhow::Context as _;
-pub use crate::buck2::types::ProjectRelativePath;
 use thiserror::Error;
 use utoipa::ToSchema;
 
+pub use crate::buck2::types::ProjectRelativePath;
+
 #[derive(Debug, PartialEq, Eq, Hash, Clone, serde::Serialize, serde::Deserialize, ToSchema)]
 pub enum Status<Path> {
     Modified(Path),
diff --git a/api-model/src/buck2/types.rs b/api-model/src/buck2/types.rs
@@ -1,8 +1,8 @@
 //! Types related to Buck2 build system.
 
+use parse_display::Display;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
-use parse_display::Display;
 
 /// Task phase when in buck2 build
 #[allow(dead_code)]
diff --git a/api-model/src/buck2/ws.rs b/api-model/src/buck2/ws.rs
@@ -2,7 +2,10 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::buck2::{status::Status, types::{ProjectRelativePath, TaskPhase}};
+use crate::buck2::{
+    status::Status,
+    types::{ProjectRelativePath, TaskPhase},
+};
 
 /// Message protocol for WebSocket communication between worker and server.
 #[allow(dead_code)]
diff --git a/jupiter/callisto/src/build_events.rs b/jupiter/callisto/src/build_events.rs
@@ -1,5 +1,4 @@
 /// User-defined build event, should be changed later in migration to fit
-
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
diff --git a/jupiter/callisto/src/check_result.rs b/jupiter/callisto/src/check_result.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::CheckTypeEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::CheckTypeEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "check_result")]
 pub struct Model {
diff --git a/jupiter/callisto/src/import_refs.rs b/jupiter/callisto/src/import_refs.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::RefTypeEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::RefTypeEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "import_refs")]
 pub struct Model {
diff --git a/jupiter/callisto/src/issue_cl_references.rs b/jupiter/callisto/src/issue_cl_references.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::ReferenceTypeEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::ReferenceTypeEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "issue_cl_references")]
 pub struct Model {
diff --git a/jupiter/callisto/src/mega_cl.rs b/jupiter/callisto/src/mega_cl.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::MergeStatusEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::MergeStatusEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "mega_cl")]
 pub struct Model {
diff --git a/jupiter/callisto/src/mega_code_review_thread.rs b/jupiter/callisto/src/mega_code_review_thread.rs
@@ -1,11 +1,9 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::DiffSideEnum;
-use super::sea_orm_active_enums::ThreadStatusEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use super::sea_orm_active_enums::ThreadStatusEnum;
+use super::sea_orm_active_enums::{DiffSideEnum, ThreadStatusEnum};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "mega_code_review_thread")]
diff --git a/jupiter/callisto/src/mega_conversation.rs b/jupiter/callisto/src/mega_conversation.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::ConvTypeEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::ConvTypeEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "mega_conversation")]
 pub struct Model {
diff --git a/jupiter/callisto/src/merge_queue.rs b/jupiter/callisto/src/merge_queue.rs
@@ -1,10 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::QueueFailureTypeEnum;
-use super::sea_orm_active_enums::QueueStatusEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::{QueueFailureTypeEnum, QueueStatusEnum};
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "merge_queue")]
 pub struct Model {
diff --git a/jupiter/callisto/src/path_check_configs.rs b/jupiter/callisto/src/path_check_configs.rs
@@ -1,9 +1,10 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use super::sea_orm_active_enums::CheckTypeEnum;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
+use super::sea_orm_active_enums::CheckTypeEnum;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "path_check_configs")]
 pub struct Model {
diff --git a/jupiter/src/migration/mod.rs b/jupiter/src/migration/mod.rs
@@ -79,8 +79,8 @@ mod m20260108_105158_remove_storage_type_enum;
 mod m20260115_000000_create_targets_table;
 mod m20260119_060233_add_mega_code_review;
 mod m20260127_081517_create_build_triggers;
-mod m20260130_065535_refactor_orion_module;
 mod m20260128_080549_add_mega_code_review_anchor_and_position;
+mod m20260130_065535_refactor_orion_module;
 
 /// Creates a primary key column definition with big integer type.
 ///
diff --git a/orion-server/src/api.rs b/orion-server/src/api.rs
@@ -5,12 +5,13 @@ use std::{
 
 use anyhow::Result;
 use api_model::buck2::{
-        api::{RetryBuildRequest, TaskBuildRequest},
-        types::{
-            LogErrorResponse, LogEvent, LogLinesResponse, LogReadMode, ProjectRelativePath, Status, TargetLogLinesResponse, TargetLogQuery, TaskHistoryQuery
-        },
-        ws::WSMessage,
-    };
+    api::{RetryBuildRequest, TaskBuildRequest},
+    types::{
+        LogErrorResponse, LogEvent, LogLinesResponse, LogReadMode, ProjectRelativePath, Status,
+        TargetLogLinesResponse, TargetLogQuery, TaskHistoryQuery,
+    },
+    ws::WSMessage,
+};
 use axum::{
     Json, Router,
     extract::{
@@ -42,12 +43,14 @@ use crate::{
     auto_retry::AutoRetryJudger,
     log::log_service::LogService,
     model::{
-        builds, targets::{self, TargetState, TargetWithBuilds},
+        builds,
+        targets::{self, TargetState, TargetWithBuilds},
         tasks,
     },
     orion_common::model::{CommonPage, PageParams},
     scheduler::{
-        self, BuildEventPayload, BuildInfo, BuildRequest, TaskQueueStats, TaskScheduler, WorkerInfo, WorkerStatus
+        self, BuildEventPayload, BuildInfo, BuildRequest, TaskQueueStats, TaskScheduler,
+        WorkerInfo, WorkerStatus,
     },
 };
 
@@ -1685,7 +1688,7 @@ pub async fn build_retry_handler(
     }
 }
 
-// TODO: replace with new build 
+// TODO: replace with new build
 async fn immediate_work(
     state: &AppState,
     build_id: Uuid,
@@ -1706,11 +1709,11 @@ async fn immediate_work(
     // Create build information
 
     let event = BuildEventPayload::new(
-        build.id, 
-        build.task_id, 
-        req.cl_link.clone(), 
-        build.repo.clone(), 
-        retry_count
+        build.id,
+        build.task_id,
+        req.cl_link.clone(),
+        build.repo.clone(),
+        retry_count,
     );
     let build_info = BuildInfo {
         event_payload: event,
diff --git a/orion-server/src/scheduler.rs b/orion-server/src/scheduler.rs
@@ -439,8 +439,13 @@ impl TaskScheduler {
         let build_info = BuildInfo {
             event_payload: pending_build_event.event_payload.clone(),
             changes: pending_build_event.changes.clone(),
-            target_id: pending_build_event.target_id.map_or_else(|| Uuid::nil(), |id| id),
-            target_path: pending_build_event.target_path.clone().unwrap_or_else(|| "".to_string()),
+            target_id: pending_build_event
+                .target_id
+                .map_or_else(|| Uuid::nil(), |id| id),
+            target_path: pending_build_event
+                .target_path
+                .clone()
+                .unwrap_or_else(|| "".to_string()),
             _worker_id: chosen_id.clone(),
             auto_retry_judger: AutoRetryJudger::new(),
             started_at: start_at,
diff --git a/orion/buck/cells.rs b/orion/buck/cells.rs
@@ -11,6 +11,7 @@
 use std::{collections::HashMap, fs, path::Path};
 
 use anyhow::Context as _;
+use api_model::buck2::types::ProjectRelativePath;
 use itertools::Itertools;
 use td_util::prelude::*;
 use thiserror::Error;
@@ -19,7 +20,6 @@ use crate::{
     ignore_set::IgnoreSet,
     types::{CellName, CellPath, CellRelativePath},
 };
-use api_model::buck2::types::ProjectRelativePath;
 
 /// The value of `buildfile.name` if omitted.
 const DEFAULT_BUILD_FILES: &[&str] = &["BUCK.v2", "BUCK"];
diff --git a/orion/buck/glob.rs b/orion/buck/glob.rs
@@ -10,11 +10,11 @@
 
 //! Equivalent to the Buck2 `glob` to the greatest extent possible.
 
+use api_model::buck2::types::ProjectRelativePath;
 use glob::{MatchOptions, Pattern};
 use itertools::{Either, Itertools};
 
 use crate::types::{Glob, GlobInclusion};
-use api_model::buck2::types::ProjectRelativePath;
 
 pub struct GlobSpec {
     include: GlobSet,
diff --git a/orion/buck/owners.rs b/orion/buck/owners.rs
@@ -13,7 +13,7 @@ use std::collections::HashMap;
 use api_model::buck2::types::ProjectRelativePath;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{TargetLabel};
+use crate::types::TargetLabel;
 
 /// The output of running `buck2 uquery --json owner(...)`.
 /// Maps file paths to the targets that own them.
diff --git a/orion/buck/types.rs b/orion/buck/types.rs
@@ -608,8 +608,6 @@ impl TargetHash {
     }
 }
 
-
-
 #[derive(Debug)]
 pub struct CellRelativePath(String);
 
diff --git a/orion/src/api.rs b/orion/src/api.rs
@@ -1,10 +1,11 @@
-// use api_model::buck2::{api::{TaskBuildRequest, TaskBuildResult}, types::Status, ws::WSMessage};
-// use serde::Serialize;
-// use td_util_buck::types::ProjectRelativePath;
-// use tokio::sync::mpsc::UnboundedSender;
-// use uuid::Uuid;
+use api_model::buck2::{
+    api::{TaskBuildRequest, TaskBuildResult},
+    ws::WSMessage,
+};
+use tokio::sync::mpsc::UnboundedSender;
+use uuid::Uuid;
 
-// use crate::{buck_controller};
+use crate::buck_controller;
 
 // /// Parameters required to execute a buck build operation.
 // #[derive(Debug)]
@@ -78,7 +79,7 @@ pub async fn buck_build(
                     message,
                     status.code()
                 );
-                BuildResult {
+                TaskBuildResult {
                     success: status.success(),
                     id: id_str.clone(),
                     exit_code: status.code(),
@@ -88,7 +89,7 @@ pub async fn buck_build(
             Err(e) => {
                 let error_msg = format!("Build execution failed: {e}");
                 tracing::error!("[Task {}] {}", id_str, error_msg);
-                BuildResult {
+                TaskBuildResult {
                     success: false,
                     id: id_str.clone(),
                     exit_code: None,
diff --git a/orion/src/buck_controller.rs b/orion/src/buck_controller.rs
@@ -7,25 +7,24 @@ use std::{
 };
 
 use anyhow::anyhow;
+use api_model::buck2::{
+    types::{ProjectRelativePath, Status, TaskPhase},
+    ws::WSMessage,
+};
 use once_cell::sync::Lazy;
 use serde_json::{Value, json};
 use td_util::{command::spawn, file_io::file_writer};
 use td_util_buck::{
     cells::CellInfo,
     run::{Buck2, targets_arguments},
-    targets::Targets, types::TargetLabel,
+    targets::Targets,
+    types::TargetLabel,
 };
 use tokio::{io::AsyncBufReadExt, process::Command, sync::mpsc::UnboundedSender, time::Duration};
 
 // Import complete Error trait for better error handling
 use crate::repo::changes::Changes;
-use crate::{
-    repo::{diff},
-};
-use api_model::buck2::{
-    types::{ProjectRelativePath, Status, TaskPhase},
-    ws::WSMessage,
-};
+use crate::repo::diff;
 
 fn scorpio_base_url() -> String {
     crate::scorpio_api::base_url()
diff --git a/orion/src/repo/changes.rs b/orion/src/repo/changes.rs
@@ -16,7 +16,6 @@ use td_util_buck::{
     cells::CellInfo,
     types::{CellPath, Package},
 };
-use ProjectRelativePath;
 
 #[derive(Default, Debug)]
 pub struct Changes {
@@ -92,7 +91,9 @@ impl Changes {
 }
 #[cfg(test)]
 mod tests {
-    use td_util_buck::types::{CellPath, ProjectRelativePath};
+    use api_model::buck2::types::ProjectRelativePath;
+    use td_util_buck::types::CellPath;
+
     use super::*;
 
     #[test]
diff --git a/orion/src/repo/diff.rs b/orion/src/repo/diff.rs
@@ -664,17 +664,17 @@ fn annotate_terminal_nodes(
 #[cfg(test)]
 mod tests {
 
+    use api_model::buck2::{status::Status, types::ProjectRelativePath};
     use itertools::Itertools;
     use td_util::prelude::*;
     use td_util_buck::{
         cells::CellInfo,
         labels::Labels,
         targets::{BuckImport, TargetsEntry},
-        types::{PackageValues, ProjectRelativePath, TargetHash, TargetPattern},
+        types::{PackageValues, TargetHash, TargetPattern},
     };
 
     use super::*;
-    use crate::repo::sapling::status::Status;
 
     fn basic_changes() -> Changes {
         Changes::testing(&[Status::Modified(CellPath::new("foo//irrelevant_file"))])
diff --git a/orion/src/repo/sapling/mod.rs b/orion/src/repo/sapling/mod.rs
@@ -7,5 +7,4 @@
 //  * of this source tree. You may select, at your option, one of the
 //  * above-listed licenses.
 //  */
-
 // pub mod status;
diff --git a/orion/src/ws.rs b/orion/src/ws.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/// User-defined build event, should be changed later in migration to fit`
`2`		`-`
`3`	`2`	`use sea_orm::entity::prelude::*;`
`4`	`3`	`use serde::{Deserialize, Serialize};`
`5`	`4`