chore(deps): Bump yscope-dev-utils to y-scope/yscope-dev-utils@0c214c4.

components/api-server/src/bin/api_server.rs

@@ -1,6 +1,7 @@
 use anyhow::Context;
 use clap::Parser;
-use clp_rust_utils::{clp_config::package, serde::yaml};
+use clp_rust_utils::clp_config::package;
+use clp_rust_utils::serde::yaml;
 
 #[derive(Parser)]
 #[command(version, about = "API Server for CLP.")]

components/api-server/src/client.rs

@@ -1,22 +1,28 @@
 use std::pin::Pin;
 
 use async_stream::stream;
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::DateTime;
+use chrono::TimeZone;
+use chrono::Utc;
+use clp_rust_utils::aws::AWS_DEFAULT_REGION;
+use clp_rust_utils::clp_config::package::config::Config;
+use clp_rust_utils::clp_config::package::config::StorageEngine;
+use clp_rust_utils::clp_config::package::config::StreamOutputStorage;
+use clp_rust_utils::clp_config::package::credentials::Credentials;
+use clp_rust_utils::database::mysql::create_clp_db_mysql_pool;
 pub use clp_rust_utils::job_config::CompressionJobStatus;
-use clp_rust_utils::{
-    aws::AWS_DEFAULT_REGION,
-    clp_config::package::{
-        config::{Config, StorageEngine, StreamOutputStorage},
-        credentials::Credentials,
-    },
-    database::mysql::create_clp_db_mysql_pool,
-    job_config::{QUERY_JOBS_TABLE_NAME, QueryJobStatus, QueryJobType, SearchJobConfig},
-};
-use futures::{Stream, StreamExt};
+use clp_rust_utils::job_config::QUERY_JOBS_TABLE_NAME;
+use clp_rust_utils::job_config::QueryJobStatus;
+use clp_rust_utils::job_config::QueryJobType;
+use clp_rust_utils::job_config::SearchJobConfig;
+use futures::Stream;
+use futures::StreamExt;
 use pin_project_lite::pin_project;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use sqlx::Row;
-use utoipa::{IntoParams, ToSchema};
+use utoipa::IntoParams;
+use utoipa::ToSchema;
 
 pub use crate::error::ClientError;
 

components/api-server/src/error.rs

@@ -1,4 +1,5 @@
-use aws_sdk_s3::{error::SdkError, primitives::ByteStreamError};
+use aws_sdk_s3::error::SdkError;
+use aws_sdk_s3::primitives::ByteStreamError;
 use num_enum::TryFromPrimitive;
 use thiserror::Error;
 

components/api-server/src/routes.rs

@@ -1,29 +1,31 @@
-use axum::{
-    Json,
-    extract::{Path, Query, State},
-    http::StatusCode,
-    response::{
-        IntoResponse,
-        Sse,
-        sse::{Event, KeepAlive},
-    },
-    routing::get,
-};
-use futures::{Stream, StreamExt};
-use serde::{Deserialize, Serialize};
+use axum::Json;
+use axum::extract::Path;
+use axum::extract::Query;
+use axum::extract::State;
+use axum::http::StatusCode;
+use axum::response::IntoResponse;
+use axum::response::Sse;
+use axum::response::sse::Event;
+use axum::response::sse::KeepAlive;
+use axum::routing::get;
+use futures::Stream;
+use futures::StreamExt;
+use serde::Deserialize;
+use serde::Serialize;
 use thiserror::Error;
-use tower_http::cors::{Any, CorsLayer};
-use utoipa::{OpenApi, ToSchema};
-use utoipa_axum::{router::OpenApiRouter, routes};
-
-use crate::client::{
-    Client,
-    ClientError,
-    CompressionUsage,
-    CompressionUsageParams,
-    QueryConfig,
-    ValidatedCompressionUsageParams,
-};
+use tower_http::cors::Any;
+use tower_http::cors::CorsLayer;
+use utoipa::OpenApi;
+use utoipa::ToSchema;
+use utoipa_axum::router::OpenApiRouter;
+use utoipa_axum::routes;
+
+use crate::client::Client;
+use crate::client::ClientError;
+use crate::client::CompressionUsage;
+use crate::client::CompressionUsageParams;
+use crate::client::QueryConfig;
+use crate::client::ValidatedCompressionUsageParams;
 
 /// Factory method to create an Axum router configured with all API routes.
 ///
@@ -65,14 +67,12 @@ pub fn from_client(client: Client) -> Result<axum::Router, serde_json::Error> {
 mod api_doc {
     // Using `super::...` can cause `super` to appear as a tag in the generated OpenAPI
     // documentation. Importing the paths directly prevents this issue.
-    use super::{
-        __path_cancel_query,
-        __path_compression_usage,
-        __path_health,
-        __path_query,
-        __path_query_results,
-        CompressionUsage,
-    };
+    use super::__path_cancel_query;
+    use super::__path_compression_usage;
+    use super::__path_health;
+    use super::__path_query;
+    use super::__path_query_results;
+    use super::CompressionUsage;
     use crate::client::CompressionJobStatus;
 
     #[derive(utoipa::OpenApi)]
@@ -337,11 +337,10 @@ impl IntoResponse for HandlerError {
 
 #[cfg(test)]
 mod tests {
-    use axum::{
-        body::Body,
-        http::{Request, StatusCode},
-        routing::get,
-    };
+    use axum::body::Body;
+    use axum::http::Request;
+    use axum::http::StatusCode;
+    use axum::routing::get;
     use http_body_util::BodyExt;
     use tower::ServiceExt;
 

components/clp-rust-utils/src/clp_config/package/config.rs

@@ -1,15 +1,14 @@
-use std::{
-    num::{NonZeroU32, NonZeroU64},
-    path::{Path, PathBuf},
-};
+use std::num::NonZeroU32;
+use std::num::NonZeroU64;
+use std::path::Path;
+use std::path::PathBuf;
 
 use non_empty_string::NonEmptyString;
 use serde::Deserialize;
 
-use crate::{
-    clp_config::{AwsAuthentication, S3Config},
-    dataset::resolve_dataset_name,
-};
+use crate::clp_config::AwsAuthentication;
+use crate::clp_config::S3Config;
+use crate::dataset::resolve_dataset_name;
 
 /// Mirror of `clp_py_utils.clp_config.ClpConfig`.
 ///
@@ -562,13 +561,11 @@ fn default_archive_staging_directory() -> String {
 mod tests {
     use std::path::Path;
 
-    use super::{
-        ArchiveOutput,
-        ArchiveOutputStorage,
-        Database,
-        LogsInput,
-        SpiderTaskExecutorConfig,
-    };
+    use super::ArchiveOutput;
+    use super::ArchiveOutputStorage;
+    use super::Database;
+    use super::LogsInput;
+    use super::SpiderTaskExecutorConfig;
 
     #[test]
     fn deserialize_logs_input_s3_config() {
@@ -671,7 +668,8 @@ mod tests {
     fn dataset_archive_storage_directory_s3() {
         use non_empty_string::NonEmptyString;
 
-        use crate::clp_config::{AwsAuthentication, S3Config};
+        use crate::clp_config::AwsAuthentication;
+        use crate::clp_config::S3Config;
 
         let archive_output = ArchiveOutput {
             storage: ArchiveOutputStorage::S3 {
@@ -769,7 +767,8 @@ mod tests {
     fn s3_config_with_staging_directory(staging_directory: &str) -> SpiderTaskExecutorConfig {
         use non_empty_string::NonEmptyString;
 
-        use crate::clp_config::{AwsAuthentication, S3Config};
+        use crate::clp_config::AwsAuthentication;
+        use crate::clp_config::S3Config;
 
         SpiderTaskExecutorConfig {
             archive_output: ArchiveOutput {

components/clp-rust-utils/src/clp_config/s3_config.rs

@@ -1,5 +1,6 @@
 use non_empty_string::NonEmptyString;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 
 /// Represents the configuration for connecting to an S3 bucket.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

components/clp-rust-utils/src/database/mysql.rs

@@ -1,10 +1,8 @@
 use secrecy::ExposeSecret;
 use strum::IntoEnumIterator;
 
-use crate::clp_config::package::{
-    config::Database as DatabaseConfig,
-    credentials::Database as DatabaseCredentials,
-};
+use crate::clp_config::package::config::Database as DatabaseConfig;
+use crate::clp_config::package::credentials::Database as DatabaseCredentials;
 
 /// Implements [`sqlx::Type<sqlx::MySql>`] for `$ty` by delegating to `$delegate`.
 ///

components/clp-rust-utils/src/dataset.rs

@@ -18,7 +18,8 @@ pub fn resolve_dataset_name(dataset: Option<&str>) -> &str {
 
 #[cfg(test)]
 mod tests {
-    use super::{CLP_DEFAULT_DATASET_NAME, resolve_dataset_name};
+    use super::CLP_DEFAULT_DATASET_NAME;
+    use super::resolve_dataset_name;
 
     #[test]
     fn resolve_dataset_name_passes_through_some() {

components/clp-rust-utils/src/job_config/clp_io_config.rs

@@ -1,11 +1,10 @@
 use non_empty_string::NonEmptyString;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 
-use crate::{
-    clp_config::S3Config,
-    job_config::ingestion::JobId as IngestionJobId,
-    s3::S3ObjectMetadataId,
-};
+use crate::clp_config::S3Config;
+use crate::job_config::ingestion::JobId as IngestionJobId;
+use crate::s3::S3ObjectMetadataId;
 
 /// Represents CLP IO config.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

components/clp-rust-utils/src/job_config/compression.rs

@@ -1,5 +1,7 @@
-use num_enum::{IntoPrimitive, TryFromPrimitive};
-use serde::{Deserialize, Serialize};
+use num_enum::IntoPrimitive;
+use num_enum::TryFromPrimitive;
+use serde::Deserialize;
+use serde::Serialize;
 use strum::EnumString;
 use utoipa::ToSchema;
 

components/clp-rust-utils/src/job_config/ingestion.rs

@@ -1,6 +1,7 @@
 pub mod s3 {
     use non_empty_string::NonEmptyString;
-    use serde::{Deserialize, Serialize};
+    use serde::Deserialize;
+    use serde::Serialize;
     use thiserror::Error;
     use utoipa::ToSchema;
 

components/clp-rust-utils/src/job_config/search.rs

@@ -1,5 +1,7 @@
-use num_enum::{IntoPrimitive, TryFromPrimitive};
-use serde::{Deserialize, Serialize};
+use num_enum::IntoPrimitive;
+use num_enum::TryFromPrimitive;
+use serde::Deserialize;
+use serde::Serialize;
 
 pub const QUERY_JOBS_TABLE_NAME: &str = "query_jobs";
 

components/clp-rust-utils/src/logging.rs

@@ -1,8 +1,9 @@
-use tracing_appender::{
-    non_blocking::{NonBlockingBuilder, WorkerGuard},
-    rolling::{RollingFileAppender, Rotation},
-};
-use tracing_subscriber::{self, fmt::writer::MakeWriterExt};
+use tracing_appender::non_blocking::NonBlockingBuilder;
+use tracing_appender::non_blocking::WorkerGuard;
+use tracing_appender::rolling::RollingFileAppender;
+use tracing_appender::rolling::Rotation;
+use tracing_subscriber::fmt::writer::MakeWriterExt;
+use tracing_subscriber::{self};
 
 /// Opaque struct to hold the worker guards for the background log writers.
 /// These guards must be held for the lifetime of the program to ensure logs are flushed.

components/clp-rust-utils/src/s3/client.rs

@@ -1,8 +1,8 @@
 use aws_config::BehaviorVersion;
-use aws_sdk_s3::{
-    Client,
-    config::{Builder, Credentials, Region},
-};
+use aws_sdk_s3::Client;
+use aws_sdk_s3::config::Builder;
+use aws_sdk_s3::config::Credentials;
+use aws_sdk_s3::config::Region;
 use non_empty_string::NonEmptyString;
 
 use crate::clp_config::AwsAuthentication;

components/clp-rust-utils/src/s3/url.rs

@@ -82,7 +82,8 @@ mod tests {
     use non_empty_string::NonEmptyString;
 
     use super::generate_s3_url;
-    use crate::{Error, types::non_empty_string::ExpectedNonEmpty};
+    use crate::Error;
+    use crate::types::non_empty_string::ExpectedNonEmpty;
 
     fn to_non_empty_string(value: &'static str) -> NonEmptyString {
         NonEmptyString::from_static_str(value)

components/clp-rust-utils/src/serde/brotli_msgpack.rs

@@ -1,7 +1,10 @@
-use std::io::{Read, Write};
+use std::io::Read;
+use std::io::Write;
 
-use brotli::{CompressorWriter, Decompressor};
-use serde::{Serialize, de::DeserializeOwned};
+use brotli::CompressorWriter;
+use brotli::Decompressor;
+use serde::Serialize;
+use serde::de::DeserializeOwned;
 
 use crate::Error;
 

components/clp-rust-utils/src/sqs/client.rs

@@ -1,8 +1,8 @@
 use aws_config::BehaviorVersion;
-use aws_sdk_sqs::{
-    Client,
-    config::{Builder, Credentials, Region},
-};
+use aws_sdk_sqs::Client;
+use aws_sdk_sqs::config::Builder;
+use aws_sdk_sqs::config::Credentials;
+use aws_sdk_sqs::config::Region;
 use non_empty_string::NonEmptyString;
 
 use crate::clp_config::AwsAuthentication;

components/clp-rust-utils/src/task_io/compression.rs

@@ -1,7 +1,8 @@
 //! Protocol types exchanged with the Spider (Huntsman) tasks that run CLP S3 compression jobs.
 
 use non_empty_string::NonEmptyString;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 
 use crate::clp_config::AwsAuthentication;
 

components/clp-rust-utils/src/telemetry.rs

@@ -2,9 +2,11 @@
 
 use std::env;
 
-use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
+use opentelemetry_sdk::metrics::PeriodicReader;
+use opentelemetry_sdk::metrics::SdkMeterProvider;
 
-use crate::{Error, clp_config::package::config::Telemetry};
+use crate::Error;
+use crate::clp_config::package::config::Telemetry;
 
 /// RAII guard that shuts down the meter provider and flushes pending metric exports when dropped.
 pub struct TelemetryGuard {

components/clp-rust-utils/tests/clp_config_test.rs

@@ -1,9 +1,12 @@
-use clp_rust_utils::{
-    clp_config::{AwsAuthentication, AwsCredentials, S3Config},
-    job_config::{ClpIoConfig, InputConfig, OutputConfig, S3ObjectMetadataInputConfig},
-    serde::BrotliMsgpack,
-    types::non_empty_string::ExpectedNonEmpty,
-};
+use clp_rust_utils::clp_config::AwsAuthentication;
+use clp_rust_utils::clp_config::AwsCredentials;
+use clp_rust_utils::clp_config::S3Config;
+use clp_rust_utils::job_config::ClpIoConfig;
+use clp_rust_utils::job_config::InputConfig;
+use clp_rust_utils::job_config::OutputConfig;
+use clp_rust_utils::job_config::S3ObjectMetadataInputConfig;
+use clp_rust_utils::serde::BrotliMsgpack;
+use clp_rust_utils::types::non_empty_string::ExpectedNonEmpty;
 use non_empty_string::NonEmptyString;
 use serde_json::Value;