chore: bump edition from 2021 to 2024

Author: ymgyt

Cargo.toml

@@ -6,7 +6,7 @@ resolver = "2"
 authors     = ["ymgyt"]
 categories  = ["command-line-utilities"]
 description = "terminal feed viewer"
-edition     = "2021"
+edition     = "2024"
 homepage    = "https://docs.syndicationd.ymgyt.io/synd-term/"
 keywords    = ["feed", "rss", "atom", "tui"]
 license     = "MIT OR Apache-2.0"

crates/synd_api/src/client/github/client.rs

@@ -2,7 +2,7 @@ use std::{fmt::Debug, time::Duration};
 
 use graphql_client::{GraphQLQuery, Response};
 use reqwest::header::{self, HeaderValue};
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 
 use crate::{client::github::query, config};
 

crates/synd_api/src/dependency.rs

@@ -13,8 +13,8 @@ use crate::{
     config,
     monitor::Monitors,
     repository::kvsd::KvsdClient,
-    serve::{auth::Authenticator, ServeOptions},
-    usecase::{authorize::Authorizer, MakeUsecase, Runtime},
+    serve::{ServeOptions, auth::Authenticator},
+    usecase::{MakeUsecase, Runtime, authorize::Authorizer},
 };
 
 pub struct Dependency {

crates/synd_api/src/gql/mod.rs

@@ -15,7 +15,7 @@ pub(crate) type SyndSchema = Schema<Query, Mutation, EmptySubscription>;
 pub(crate) mod handler {
     use async_graphql::http::GraphiQLSource;
     use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
-    use axum::{response::IntoResponse, Extension};
+    use axum::{Extension, response::IntoResponse};
     use synd_o11y::audit_span;
     use tokio_metrics::TaskMonitor;
     use tracing::Instrument;

crates/synd_api/src/gql/object/mod.rs

@@ -1,8 +1,8 @@
 use std::{borrow::Cow, sync::Arc};
 
 use async_graphql::{
+    ID, Object, SimpleObject,
     connection::{Connection, ConnectionNameType, Edge, EdgeNameType, EmptyFields},
-    Object, SimpleObject, ID,
 };
 use feed_rs::model as feedrs;
 use synd_feed::types::{self, Annotated, Category, FeedType, FeedUrl, Requirement};

crates/synd_api/src/gql/query.rs

@@ -1,14 +1,14 @@
 use std::borrow::Cow;
 
 use async_graphql::{
-    connection::{Connection, Edge},
     Context, Object, Result, SimpleObject,
+    connection::{Connection, Edge},
 };
 use synd_feed::types::FeedUrl;
 
 use crate::{
     gql::{
-        object::{self, id, Entry},
+        object::{self, Entry, id},
         run_usecase,
     },
     usecase::{

crates/synd_api/src/main.rs

@@ -4,7 +4,7 @@ use fdlimit::Outcome;
 use synd_o11y::{
     opentelemetry::OpenTelemetryGuard, tracing_subscriber::initializer::TracingInitializer,
 };
-use synd_stdx::io::color::{is_color_supported, ColorSupport};
+use synd_stdx::io::color::{ColorSupport, is_color_supported};
 use tracing::{error, info};
 
 use synd_api::{

crates/synd_api/src/monitor.rs

@@ -99,11 +99,11 @@ impl Monitors {
 mod tests {
     use std::sync::{Arc, Mutex};
 
-    use tracing::{instrument::WithSubscriber, Event, Subscriber};
+    use tracing::{Event, Subscriber, instrument::WithSubscriber};
     use tracing_subscriber::{
+        Layer, Registry,
         layer::{Context, SubscriberExt as _},
         registry::LookupSpan,
-        Layer, Registry,
     };
 
     use super::*;

crates/synd_api/src/repository/kvsd.rs

@@ -4,18 +4,17 @@ use anyhow::Context;
 use async_trait::async_trait;
 use futures_util::TryFutureExt;
 use kvsd::{
-    client::{tcp::Client, Api},
     Key, Value,
+    client::{Api, tcp::Client},
 };
 use thiserror::Error;
 use tokio::sync::Mutex;
 use tokio::{net::TcpStream, sync::MutexGuard};
 
 use crate::repository::{
-    self,
+    self, RepositoryError, SubscriptionRepository,
     subscription::RepositoryResult,
     types::{FeedAnnotations, SubscribedFeeds},
-    RepositoryError, SubscriptionRepository,
 };
 
 #[derive(Error, Debug)]

crates/synd_api/src/repository/mod.rs

@@ -29,12 +29,16 @@ mod tests {
 
     #[test]
     fn error() {
-        assert!(!RepositoryError::internal(anyhow::anyhow!("error"))
-            .to_string()
-            .is_empty());
+        assert!(
+            !RepositoryError::internal(anyhow::anyhow!("error"))
+                .to_string()
+                .is_empty()
+        );
 
-        assert!(!RepositoryError::from(KvsdError::Unauthenticated)
-            .to_string()
-            .is_empty());
+        assert!(
+            !RepositoryError::from(KvsdError::Unauthenticated)
+                .to_string()
+                .is_empty()
+        );
     }
 }

crates/synd_api/src/serve/mod.rs

@@ -1,15 +1,15 @@
 use std::{net::IpAddr, time::Duration};
 
 use axum::{
+    BoxError, Extension, Router,
     error_handling::HandleErrorLayer,
-    http::{header::AUTHORIZATION, StatusCode},
+    http::{StatusCode, header::AUTHORIZATION},
     response::IntoResponse,
     routing::{get, post},
-    BoxError, Extension, Router,
 };
 use tokio::net::TcpListener;
 use tokio_metrics::TaskMonitor;
-use tower::{limit::ConcurrencyLimitLayer, timeout::TimeoutLayer, ServiceBuilder};
+use tower::{ServiceBuilder, limit::ConcurrencyLimitLayer, timeout::TimeoutLayer};
 use tower_http::{
     cors::CorsLayer, limit::RequestBodyLimitLayer, sensitive_headers::SetSensitiveHeadersLayer,
 };

crates/synd_api/src/serve/probe.rs

@@ -1,7 +1,7 @@
 use axum::{
-    http::{header, StatusCode},
-    response::IntoResponse,
     Json,
+    http::{StatusCode, header},
+    response::IntoResponse,
 };
 use synd_o11y::health_check::Health;
 

crates/synd_api/src/shutdown.rs

@@ -62,8 +62,8 @@ mod tests {
     use std::{
         io::ErrorKind,
         sync::{
-            atomic::{AtomicBool, Ordering},
             Arc,
+            atomic::{AtomicBool, Ordering},
         },
     };
 

crates/synd_api/src/usecase/fetch_entries.rs

@@ -1,6 +1,6 @@
 use std::{cmp::Ordering, collections::HashMap, sync::Arc};
 
-use futures_util::{stream::FuturesUnordered, StreamExt};
+use futures_util::{StreamExt, stream::FuturesUnordered};
 use synd_feed::{
     feed::{cache::FetchCachedFeed, service::FetchFeedError},
     types::{self, Annotated, Entry, EntryId, FeedMeta, FeedUrl},
@@ -10,10 +10,10 @@ use thiserror::Error;
 use crate::{
     principal::Principal,
     repository::{
-        types::{FeedAnnotations, SubscribedFeeds},
         SubscriptionRepository,
+        types::{FeedAnnotations, SubscribedFeeds},
     },
-    usecase::{authorize::Unauthorized, Error, Input, MakeUsecase, Output, Usecase},
+    usecase::{Error, Input, MakeUsecase, Output, Usecase, authorize::Unauthorized},
 };
 
 pub struct FetchEntries {

crates/synd_api/src/usecase/fetch_subscribed_feeds.rs

@@ -8,8 +8,8 @@ use thiserror::Error;
 
 use crate::{
     principal::Principal,
-    repository::{types::SubscribedFeeds, SubscriptionRepository},
-    usecase::{authorize::Unauthorized, Error, Input, MakeUsecase, Output, Usecase},
+    repository::{SubscriptionRepository, types::SubscribedFeeds},
+    usecase::{Error, Input, MakeUsecase, Output, Usecase, authorize::Unauthorized},
 };
 
 pub struct FetchSubscribedFeeds {

crates/synd_api/src/usecase/subscribe_feed.rs

@@ -13,7 +13,7 @@ use crate::{
     usecase::{Input, Output},
 };
 
-use super::{authorize::Unauthorized, Usecase};
+use super::{Usecase, authorize::Unauthorized};
 
 pub struct SubscribeFeed {
     pub repository: Arc<dyn SubscriptionRepository>,

crates/synd_api/src/usecase/unsubscribe_feed.rs

@@ -9,7 +9,7 @@ use crate::{
     usecase::{Input, Output},
 };
 
-use super::{authorize::Unauthorized, Usecase};
+use super::{Usecase, authorize::Unauthorized};
 
 pub struct UnsubscribeFeed {
     pub repository: Arc<dyn SubscriptionRepository>,

crates/synd_auth/src/device_flow/mod.rs

@@ -117,7 +117,9 @@ impl<P: Provider> DeviceFlow<P> {
                 }
                 other => {
                     let error_msg = response.text().await.unwrap_or_default();
-                    anyhow::bail!("Failed to authenticate. authorization server respond with {other} {error_msg}")
+                    anyhow::bail!(
+                        "Failed to authenticate. authorization server respond with {other} {error_msg}"
+                    )
                 }
             }
         };

crates/synd_auth/src/jwt/google.rs

@@ -11,7 +11,7 @@ use reqwest::{Client, Url};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{config, USER_AGENT};
+use crate::{USER_AGENT, config};
 
 type Kid = String;
 

crates/synd_feed/src/types/category.rs

@@ -101,10 +101,12 @@ mod tests {
         use async_graphql::ScalarType;
 
         assert!(Category::parse(async_graphql::Value::Null).is_err());
-        assert!(Category::parse(async_graphql::Value::String(
-            "a".repeat(Category::MAX_LEN + 1)
-        ))
-        .is_err());
+        assert!(
+            Category::parse(async_graphql::Value::String(
+                "a".repeat(Category::MAX_LEN + 1)
+            ))
+            .is_err()
+        );
     }
 
     #[test]

crates/synd_kvsd/src/config/resolver.rs

@@ -6,8 +6,9 @@ use thiserror::Error;
 use crate::{
     cli::KvsdOptions,
     config::{
+        Config,
         file::{ConfigFile, ConfigFileError},
-        kvsd, Config,
+        kvsd,
     },
 };
 

crates/synd_kvsd/src/main.rs

@@ -5,8 +5,8 @@ use synd_kvsd::{
     cli::{self, ObservabilityOptions},
     config::{self, ConfigResolver},
 };
-use synd_o11y::{tracing_subscriber::initializer::TracingInitializer, OpenTelemetryGuard};
-use synd_stdx::io::color::{is_color_supported, ColorSupport};
+use synd_o11y::{OpenTelemetryGuard, tracing_subscriber::initializer::TracingInitializer};
+use synd_stdx::io::color::{ColorSupport, is_color_supported};
 
 fn init_tracing(options: &ObservabilityOptions) -> Option<OpenTelemetryGuard> {
     let ObservabilityOptions {

crates/synd_kvsd/src/middleware/stack.rs

@@ -1,5 +1,5 @@
 use crate::{
-    middleware::{telemetry::Telemetry, Dispatcher, Middleware},
+    middleware::{Dispatcher, Middleware, telemetry::Telemetry},
     uow::UnitOfWork,
 };
 

crates/synd_kvsd/src/table/table.rs

@@ -10,8 +10,8 @@ use tracing::debug;
 
 use crate::{
     table::{
-        index::{Index, IndexError},
         Namespace,
+        index::{Index, IndexError},
     },
     uow::{UnitOfWork, UowError, UowReceiver},
 };

crates/synd_kvsd_protocol/src/connection.rs

@@ -133,8 +133,8 @@ mod tests {
     use std::ops::Add;
 
     use crate::{
-        message::{Authenticate, Fail, FailCode, Ping, Set, Success},
         Key, Value,
+        message::{Authenticate, Fail, FailCode, Ping, Set, Success},
     };
 
     use super::*;

crates/synd_kvsd_protocol/src/message/frame.rs

@@ -2,7 +2,7 @@ use std::io;
 
 use tokio::io::AsyncWriteExt;
 
-use crate::message::{spec, MessageType};
+use crate::message::{MessageType, spec};
 
 pub(in crate::message) mod prefix {
     pub(in crate::message) const MESSAGE_START: u8 = b'*';

crates/synd_kvsd_protocol/src/message/parse.rs

@@ -69,11 +69,11 @@ impl Parser {
 
 pub(super) mod parse {
     use nom::{
+        IResult, Parser as _,
         bytes::streaming::{tag, take},
         combinator::{map, peek},
         number::streaming::{be_u64, u8},
         sequence::{pair, preceded, terminated},
-        IResult, Parser as _,
     };
 
     use crate::message::{frame::prefix, spec};
@@ -132,7 +132,7 @@ pub(super) mod parse {
     mod tests {
         use chrono::DateTime;
 
-        use crate::message::{frame::Frame, MessageType};
+        use crate::message::{MessageType, frame::Frame};
 
         use super::*;
 

crates/synd_kvsd_protocol/src/message/payload/authenticate.rs

@@ -1,4 +1,4 @@
-use crate::message::{parse::parse, MessageFrames, MessageType, ParseError};
+use crate::message::{MessageFrames, MessageType, ParseError, parse::parse};
 
 /// `Authenticate` is a message in which client requests the server
 /// to perform authentication process.

crates/synd_kvsd_protocol/src/message/payload/fail.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::message::{parse::parse, MessageFrames, MessageType, ParseError};
+use crate::message::{MessageFrames, MessageType, ParseError, parse::parse};
 
 const UNDEFINED: &str = "UNDEFINED";
 const UNAUTHENTICATED: &str = "UNAUTHENTICATED";

crates/synd_kvsd_protocol/src/message/payload/ping.rs

@@ -1,6 +1,6 @@
 use crate::{
-    message::{frame::prefix, parse::parse, MessageFrames, MessageType, ParseError},
     Time,
+    message::{MessageFrames, MessageType, ParseError, frame::prefix, parse::parse},
 };
 use chrono::{DateTime, Utc};
 

crates/synd_kvsd_protocol/src/message/payload/set.rs

@@ -1,6 +1,6 @@
 use crate::{
-    message::{parse::parse, MessageFrames, MessageType, ParseError},
     Key, Value,
+    message::{MessageFrames, MessageType, ParseError, parse::parse},
 };
 
 #[derive(Debug, Clone, PartialEq)]

crates/synd_kvsd_protocol/src/message/payload/success.rs

@@ -1,6 +1,6 @@
 use crate::{
-    message::{frame::prefix, parse::parse, MessageFrames, ParseError},
     Value,
+    message::{MessageFrames, ParseError, frame::prefix, parse::parse},
 };
 
 #[derive(Debug, Clone, PartialEq)]

crates/synd_o11y/src/opentelemetry/mod.rs

@@ -1,5 +1,5 @@
 mod resource;
-pub use resource::{resource, Resource};
+pub use resource::{Resource, resource};
 
 mod propagation;
 pub use propagation::{http, init_propagation};

crates/synd_o11y/src/opentelemetry/resource.rs

@@ -1,8 +1,8 @@
 use opentelemetry::KeyValue;
 use opentelemetry_sdk::resource::EnvResourceDetector;
 use opentelemetry_semantic_conventions::{
-    resource::{SERVICE_NAME, SERVICE_NAMESPACE, SERVICE_VERSION},
     SCHEMA_URL,
+    resource::{SERVICE_NAME, SERVICE_NAMESPACE, SERVICE_VERSION},
 };
 use std::{borrow::Cow, time::Duration};