fix accidental import separations

jamsocket · Dec 3, 2024 · 164567a · 164567a
1 parent a33face
commit 164567a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/plane/src/controller/core.rs b/plane/src/controller/core.rs
@@ -1,3 +1,4 @@
+use crate::database::{connect::ConnectError, PlaneDatabase};
 use chrono::{DateTime, Utc};
 use plane_common::{
     names::{AnyNodeName, ControllerName},
@@ -8,8 +9,6 @@ use plane_common::{
 use std::net::IpAddr;
 use url::Url;
 
-use crate::database::{connect::ConnectError, PlaneDatabase};
-
 #[derive(Clone)]
 pub struct Controller {
     pub db: PlaneDatabase,

diff --git a/plane/src/drone/command.rs b/plane/src/drone/command.rs
@@ -1,9 +1,8 @@
-use crate::util::resolve_hostname;
-
 use super::{
     runtime::{docker::DockerRuntimeConfig, unix_socket::UnixSocketRuntimeConfig},
     DroneConfig, ExecutorConfig,
 };
+use crate::util::resolve_hostname;
 use anyhow::Result;
 use chrono::Duration;
 use clap::Parser;

diff --git a/plane/src/drone/executor.rs b/plane/src/drone/executor.rs
@@ -1,6 +1,5 @@
-use crate::util::GuardHandle;
-
 use super::{backend_manager::BackendManager, runtime::Runtime, state_store::StateStore};
+use crate::util::GuardHandle;
 use anyhow::Result;
 use chrono::Utc;
 use dashmap::DashMap;

diff --git a/plane/src/drone/key_manager.rs b/plane/src/drone/key_manager.rs
@@ -1,6 +1,5 @@
-use crate::util::GuardHandle;
-
 use super::executor::Executor;
+use crate::util::GuardHandle;
 use chrono::Utc;
 use plane_common::{
     log_types::LoggableTime,

diff --git a/plane/src/drone/mod.rs b/plane/src/drone/mod.rs
@@ -1,5 +1,3 @@
-use crate::signals::wait_for_shutdown_signal;
-
 use self::{
     executor::Executor,
     heartbeat::HeartbeatLoop,
@@ -11,6 +9,7 @@ use self::{
     },
     state_store::StateStore,
 };
+use crate::signals::wait_for_shutdown_signal;
 use anyhow::{anyhow, Result};
 use chrono::{Duration, Utc};
 use plane_common::{

diff --git a/plane/src/proxy/connection_monitor.rs b/plane/src/proxy/connection_monitor.rs
@@ -1,3 +1,4 @@
+use crate::heartbeat_consts::HEARTBEAT_INTERVAL;
 use plane_common::names::BackendName;
 use std::{
     collections::{hash_map::Entry, HashMap, VecDeque},
@@ -6,8 +7,6 @@ use std::{
 };
 use tokio::task::JoinHandle;
 
-use crate::heartbeat_consts::HEARTBEAT_INTERVAL;
-
 type BackendNameListener = Box<dyn Fn(&BackendName) + Send + Sync + 'static>;
 
 #[derive(Debug, Clone)]