Formatting fixed

Author: spirali

crates/hyperqueue/src/server/backend.rs

@@ -1,6 +1,3 @@
-
-
-
 /*
 struct InnerBackend {
     tako_sender: UnboundedSender<FromGatewayMessage>,

crates/hyperqueue/src/server/client/submit.rs

@@ -4,20 +4,20 @@ use std::time::Duration;
 
 use bstr::BString;
 use chrono::{DateTime, Utc};
+use tako::Set;
 use tako::gateway::{
     ResourceRequestVariants, SharedTaskConfiguration, TaskConfiguration, TaskDataFlags, TaskSubmit,
 };
-use tako::Set;
 use tako::{Map, TaskId};
 use thin_vec::ThinVec;
 
 use crate::common::arraydef::IntArray;
 use crate::common::placeholders::{
     fill_placeholders_after_submit, fill_placeholders_log, normalize_path,
 };
+use crate::server::Senders;
 use crate::server::job::{Job, SubmittedJobDescription};
 use crate::server::state::{State, StateRef};
-use crate::server::Senders;
 use crate::transfer::messages::{
     JobDescription, JobSubmitDescription, JobTaskDescription, OpenJobResponse, SubmitRequest,
     SubmitResponse, TaskBuildDescription, TaskDescription, TaskIdSelector, TaskKind,
@@ -414,7 +414,7 @@ mod tests {
     };
     use tako::internal::tests::utils::sorted_vec;
     use tako::program::ProgramDefinition;
-    use tako::resources::{AllocationRequest, ResourceAmount, CPU_RESOURCE_NAME};
+    use tako::resources::{AllocationRequest, CPU_RESOURCE_NAME, ResourceAmount};
     use tako::{Priority, TaskId};
 
     #[test]

crates/tako/src/internal/server/comm.rs

@@ -1,15 +1,15 @@
 use std::rc::Rc;
 
 use bytes::Bytes;
-use tokio::sync::mpsc::UnboundedSender;
 use tokio::sync::Notify;
+use tokio::sync::mpsc::UnboundedSender;
 
+use crate::WorkerId;
 use crate::events::EventProcessor;
 use crate::internal::common::{Map, WrappedRcRefCell};
 use crate::internal::messages::worker::ToWorkerMessage;
 use crate::internal::server::core::Core;
 use crate::internal::transfer::auth::serialize;
-use crate::WorkerId;
 
 pub trait Comm {
     fn send_worker_message(&mut self, worker_id: WorkerId, message: &ToWorkerMessage);

crates/tako/src/internal/server/rpc.rs

@@ -10,6 +10,7 @@ use tokio::net::{TcpListener, TcpStream};
 use tokio::time::timeout;
 use tokio_util::codec::{Framed, LengthDelimitedCodec};
 
+use crate::WorkerId;
 use crate::comm::{ConnectionRegistration, RegisterWorker};
 use crate::gateway::LostWorkerReason;
 use crate::internal::common::error::DsError;
@@ -23,13 +24,12 @@ use crate::internal::server::reactor::{
     on_new_worker, on_remove_worker, on_resolve_placement, on_steal_response, on_task_error,
     on_task_finished, on_task_running,
 };
-use crate::internal::server::worker::{Worker, DEFAULT_WORKER_OVERVIEW_INTERVAL};
+use crate::internal::server::worker::{DEFAULT_WORKER_OVERVIEW_INTERVAL, Worker};
 use crate::internal::transfer::auth::{
     do_authentication, forward_queue_to_sealed_sink, open_message, serialize,
 };
 use crate::internal::transfer::transport::make_protocol_builder;
 use crate::internal::worker::configuration::sync_worker_configuration;
-use crate::WorkerId;
 
 pub struct ConnectionDescriptor {
     pub address: std::net::SocketAddr,

crates/tako/src/internal/server/task.rs

@@ -3,17 +3,17 @@ use std::rc::Rc;
 use std::time::Duration;
 use thin_vec::ThinVec;
 
-use crate::internal::common::stablemap::ExtractKey;
-use crate::internal::common::Set;
 use crate::WorkerId;
+use crate::internal::common::Set;
+use crate::internal::common::stablemap::ExtractKey;
 
 use crate::gateway::TaskDataFlags;
 use crate::internal::datasrv::dataobj::DataObjectId;
 
 use crate::internal::messages::worker::{ComputeTaskMsg, ToWorkerMessage};
 use crate::internal::server::taskmap::TaskMap;
-use crate::{static_assert_size, TaskId};
 use crate::{InstanceId, Priority};
+use crate::{TaskId, static_assert_size};
 
 #[cfg_attr(test, derive(Eq, PartialEq, Clone))]
 pub struct WaitingInfo {

crates/tako/src/internal/tests/integration/utils/worker.rs

@@ -8,8 +8,8 @@ use std::time::Duration;
 use crate::internal::common::error::DsError;
 use crate::internal::common::resources::ResourceDescriptor;
 use crate::internal::worker::configuration::{
-    OverviewConfiguration, DEFAULT_MAX_DOWNLOAD_TRIES, DEFAULT_MAX_PARALLEL_DOWNLOADS,
-    DEFAULT_WAIT_BETWEEN_DOWNLOAD_TRIES,
+    DEFAULT_MAX_DOWNLOAD_TRIES, DEFAULT_MAX_PARALLEL_DOWNLOADS,
+    DEFAULT_WAIT_BETWEEN_DOWNLOAD_TRIES, OverviewConfiguration,
 };
 use crate::launcher::{StopReason, TaskBuildContext, TaskResult};
 use crate::program::ProgramDefinition;
@@ -21,11 +21,11 @@ use tokio::io::AsyncWriteExt;
 use tokio::sync::Notify;
 use tokio::task::LocalSet;
 
+use crate::WorkerId;
 use crate::internal::worker::rpc::run_worker;
-use crate::launcher::{command_from_definitions, TaskLaunchData, TaskLauncher};
+use crate::launcher::{TaskLaunchData, TaskLauncher, command_from_definitions};
 use crate::resources::ResourceDescriptorItem;
 use crate::worker::ServerLostPolicy;
-use crate::WorkerId;
 
 pub enum WorkerSecretKey {
     Server,

crates/tako/src/internal/tests/test_query.rs

@@ -1,7 +1,7 @@
 use crate::control::WorkerTypeQuery;
 use crate::internal::scheduler::query::compute_new_worker_query;
 use crate::internal::server::core::Core;
-use crate::internal::tests::utils::env::{create_test_comm, TestEnv};
+use crate::internal::tests::utils::env::{TestEnv, create_test_comm};
 use crate::internal::tests::utils::schedule::{
     create_test_scheduler, create_test_workers, submit_test_tasks,
 };

crates/tako/src/internal/tests/utils/env.rs

@@ -1,9 +1,9 @@
 use crate::events::EventProcessor;
 use crate::gateway::LostWorkerReason;
+use crate::internal::common::Map;
 use crate::internal::common::index::ItemId;
 use crate::internal::common::resources::ResourceDescriptor;
 use crate::internal::common::utils::format_comma_delimited;
-use crate::internal::common::Map;
 use crate::internal::messages::common::TaskFailInfo;
 use crate::internal::messages::worker::{ToWorkerMessage, WorkerOverview};
 use crate::internal::scheduler::state::SchedulerState;
@@ -19,8 +19,8 @@ use crate::internal::tests::utils::schedule;
 use crate::internal::tests::utils::task::TaskBuilder;
 use crate::internal::transfer::auth::{deserialize, serialize};
 use crate::internal::worker::configuration::{
-    OverviewConfiguration, DEFAULT_MAX_DOWNLOAD_TRIES, DEFAULT_MAX_PARALLEL_DOWNLOADS,
-    DEFAULT_WAIT_BETWEEN_DOWNLOAD_TRIES,
+    DEFAULT_MAX_DOWNLOAD_TRIES, DEFAULT_MAX_PARALLEL_DOWNLOADS,
+    DEFAULT_WAIT_BETWEEN_DOWNLOAD_TRIES, OverviewConfiguration,
 };
 use crate::resources::{
     ResourceAmount, ResourceDescriptorItem, ResourceDescriptorKind, ResourceUnits,

tests/utils/wait.py

@@ -30,13 +30,13 @@ def wait_until(fn, sleep_s=0.2, on_timeout=None, timeout_s=DEFAULT_TIMEOUT):
 
 
 def wait_for_state(
-        env,
-        ids: Union[int, List[int]],
-        target_states: Union[str, List[str]],
-        commands: List[str],
-        state_index: int,
-        check_running_processes=True,
-        **kwargs,
+    env,
+    ids: Union[int, List[int]],
+    target_states: Union[str, List[str]],
+    commands: List[str],
+    state_index: int,
+    check_running_processes=True,
+    **kwargs,
 ):
     if isinstance(ids, int):
         ids = {str(ids)}