Skip to content

Commit 2162ff0

Browse files
committed
chore: bump edition from 2021 to 2024
1 parent 041a463 commit 2162ff0

File tree

75 files changed

+177
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+177
-155
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolver = "2"
66
authors = ["ymgyt"]
77
categories = ["command-line-utilities"]
88
description = "terminal feed viewer"
9-
edition = "2021"
9+
edition = "2024"
1010
homepage = "https://docs.syndicationd.ymgyt.io/synd-term/"
1111
keywords = ["feed", "rss", "atom", "tui"]
1212
license = "MIT OR Apache-2.0"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{fmt::Debug, time::Duration};
22

33
use graphql_client::{GraphQLQuery, Response};
44
use reqwest::header::{self, HeaderValue};
5-
use serde::{de::DeserializeOwned, Serialize};
5+
use serde::{Serialize, de::DeserializeOwned};
66

77
use crate::{client::github::query, config};
88

crates/synd_api/src/dependency.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use crate::{
1313
config,
1414
monitor::Monitors,
1515
repository::kvsd::KvsdClient,
16-
serve::{auth::Authenticator, ServeOptions},
17-
usecase::{authorize::Authorizer, MakeUsecase, Runtime},
16+
serve::{ServeOptions, auth::Authenticator},
17+
usecase::{MakeUsecase, Runtime, authorize::Authorizer},
1818
};
1919

2020
pub struct Dependency {

crates/synd_api/src/gql/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(crate) type SyndSchema = Schema<Query, Mutation, EmptySubscription>;
1515
pub(crate) mod handler {
1616
use async_graphql::http::GraphiQLSource;
1717
use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
18-
use axum::{response::IntoResponse, Extension};
18+
use axum::{Extension, response::IntoResponse};
1919
use synd_o11y::audit_span;
2020
use tokio_metrics::TaskMonitor;
2121
use tracing::Instrument;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::{borrow::Cow, sync::Arc};
22

33
use async_graphql::{
4+
ID, Object, SimpleObject,
45
connection::{Connection, ConnectionNameType, Edge, EdgeNameType, EmptyFields},
5-
Object, SimpleObject, ID,
66
};
77
use feed_rs::model as feedrs;
88
use synd_feed::types::{self, Annotated, Category, FeedType, FeedUrl, Requirement};

crates/synd_api/src/gql/query.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use std::borrow::Cow;
22

33
use async_graphql::{
4-
connection::{Connection, Edge},
54
Context, Object, Result, SimpleObject,
5+
connection::{Connection, Edge},
66
};
77
use synd_feed::types::FeedUrl;
88

99
use crate::{
1010
gql::{
11-
object::{self, id, Entry},
11+
object::{self, Entry, id},
1212
run_usecase,
1313
},
1414
usecase::{

crates/synd_api/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use fdlimit::Outcome;
44
use synd_o11y::{
55
opentelemetry::OpenTelemetryGuard, tracing_subscriber::initializer::TracingInitializer,
66
};
7-
use synd_stdx::io::color::{is_color_supported, ColorSupport};
7+
use synd_stdx::io::color::{ColorSupport, is_color_supported};
88
use tracing::{error, info};
99

1010
use synd_api::{

crates/synd_api/src/monitor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ impl Monitors {
9999
mod tests {
100100
use std::sync::{Arc, Mutex};
101101

102-
use tracing::{instrument::WithSubscriber, Event, Subscriber};
102+
use tracing::{Event, Subscriber, instrument::WithSubscriber};
103103
use tracing_subscriber::{
104+
Layer, Registry,
104105
layer::{Context, SubscriberExt as _},
105106
registry::LookupSpan,
106-
Layer, Registry,
107107
};
108108

109109
use super::*;

crates/synd_api/src/repository/kvsd.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ use anyhow::Context;
44
use async_trait::async_trait;
55
use futures_util::TryFutureExt;
66
use kvsd::{
7-
client::{tcp::Client, Api},
87
Key, Value,
8+
client::{Api, tcp::Client},
99
};
1010
use thiserror::Error;
1111
use tokio::sync::Mutex;
1212
use tokio::{net::TcpStream, sync::MutexGuard};
1313

1414
use crate::repository::{
15-
self,
15+
self, RepositoryError, SubscriptionRepository,
1616
subscription::RepositoryResult,
1717
types::{FeedAnnotations, SubscribedFeeds},
18-
RepositoryError, SubscriptionRepository,
1918
};
2019

2120
#[derive(Error, Debug)]

crates/synd_api/src/repository/mod.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ mod tests {
2929

3030
#[test]
3131
fn error() {
32-
assert!(!RepositoryError::internal(anyhow::anyhow!("error"))
33-
.to_string()
34-
.is_empty());
32+
assert!(
33+
!RepositoryError::internal(anyhow::anyhow!("error"))
34+
.to_string()
35+
.is_empty()
36+
);
3537

36-
assert!(!RepositoryError::from(KvsdError::Unauthenticated)
37-
.to_string()
38-
.is_empty());
38+
assert!(
39+
!RepositoryError::from(KvsdError::Unauthenticated)
40+
.to_string()
41+
.is_empty()
42+
);
3943
}
4044
}

crates/synd_api/src/serve/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use std::{net::IpAddr, time::Duration};
22

33
use axum::{
4+
BoxError, Extension, Router,
45
error_handling::HandleErrorLayer,
5-
http::{header::AUTHORIZATION, StatusCode},
6+
http::{StatusCode, header::AUTHORIZATION},
67
response::IntoResponse,
78
routing::{get, post},
8-
BoxError, Extension, Router,
99
};
1010
use tokio::net::TcpListener;
1111
use tokio_metrics::TaskMonitor;
12-
use tower::{limit::ConcurrencyLimitLayer, timeout::TimeoutLayer, ServiceBuilder};
12+
use tower::{ServiceBuilder, limit::ConcurrencyLimitLayer, timeout::TimeoutLayer};
1313
use tower_http::{
1414
cors::CorsLayer, limit::RequestBodyLimitLayer, sensitive_headers::SetSensitiveHeadersLayer,
1515
};

crates/synd_api/src/serve/probe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use axum::{
2-
http::{header, StatusCode},
3-
response::IntoResponse,
42
Json,
3+
http::{StatusCode, header},
4+
response::IntoResponse,
55
};
66
use synd_o11y::health_check::Health;
77

crates/synd_api/src/shutdown.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ mod tests {
6262
use std::{
6363
io::ErrorKind,
6464
sync::{
65-
atomic::{AtomicBool, Ordering},
6665
Arc,
66+
atomic::{AtomicBool, Ordering},
6767
},
6868
};
6969

crates/synd_api/src/usecase/fetch_entries.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{cmp::Ordering, collections::HashMap, sync::Arc};
22

3-
use futures_util::{stream::FuturesUnordered, StreamExt};
3+
use futures_util::{StreamExt, stream::FuturesUnordered};
44
use synd_feed::{
55
feed::{cache::FetchCachedFeed, service::FetchFeedError},
66
types::{self, Annotated, Entry, EntryId, FeedMeta, FeedUrl},
@@ -10,10 +10,10 @@ use thiserror::Error;
1010
use crate::{
1111
principal::Principal,
1212
repository::{
13-
types::{FeedAnnotations, SubscribedFeeds},
1413
SubscriptionRepository,
14+
types::{FeedAnnotations, SubscribedFeeds},
1515
},
16-
usecase::{authorize::Unauthorized, Error, Input, MakeUsecase, Output, Usecase},
16+
usecase::{Error, Input, MakeUsecase, Output, Usecase, authorize::Unauthorized},
1717
};
1818

1919
pub struct FetchEntries {

crates/synd_api/src/usecase/fetch_subscribed_feeds.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use thiserror::Error;
88

99
use crate::{
1010
principal::Principal,
11-
repository::{types::SubscribedFeeds, SubscriptionRepository},
12-
usecase::{authorize::Unauthorized, Error, Input, MakeUsecase, Output, Usecase},
11+
repository::{SubscriptionRepository, types::SubscribedFeeds},
12+
usecase::{Error, Input, MakeUsecase, Output, Usecase, authorize::Unauthorized},
1313
};
1414

1515
pub struct FetchSubscribedFeeds {

crates/synd_api/src/usecase/subscribe_feed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{
1313
usecase::{Input, Output},
1414
};
1515

16-
use super::{authorize::Unauthorized, Usecase};
16+
use super::{Usecase, authorize::Unauthorized};
1717

1818
pub struct SubscribeFeed {
1919
pub repository: Arc<dyn SubscriptionRepository>,

crates/synd_api/src/usecase/unsubscribe_feed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
usecase::{Input, Output},
1010
};
1111

12-
use super::{authorize::Unauthorized, Usecase};
12+
use super::{Usecase, authorize::Unauthorized};
1313

1414
pub struct UnsubscribeFeed {
1515
pub repository: Arc<dyn SubscriptionRepository>,

crates/synd_auth/src/device_flow/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ impl<P: Provider> DeviceFlow<P> {
117117
}
118118
other => {
119119
let error_msg = response.text().await.unwrap_or_default();
120-
anyhow::bail!("Failed to authenticate. authorization server respond with {other} {error_msg}")
120+
anyhow::bail!(
121+
"Failed to authenticate. authorization server respond with {other} {error_msg}"
122+
)
121123
}
122124
}
123125
};

crates/synd_auth/src/jwt/google.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use reqwest::{Client, Url};
1111
use serde::{Deserialize, Serialize};
1212
use thiserror::Error;
1313

14-
use crate::{config, USER_AGENT};
14+
use crate::{USER_AGENT, config};
1515

1616
type Kid = String;
1717

crates/synd_feed/src/types/category.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ mod tests {
101101
use async_graphql::ScalarType;
102102

103103
assert!(Category::parse(async_graphql::Value::Null).is_err());
104-
assert!(Category::parse(async_graphql::Value::String(
105-
"a".repeat(Category::MAX_LEN + 1)
106-
))
107-
.is_err());
104+
assert!(
105+
Category::parse(async_graphql::Value::String(
106+
"a".repeat(Category::MAX_LEN + 1)
107+
))
108+
.is_err()
109+
);
108110
}
109111

110112
#[test]

crates/synd_kvsd/src/config/resolver.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ use thiserror::Error;
66
use crate::{
77
cli::KvsdOptions,
88
config::{
9+
Config,
910
file::{ConfigFile, ConfigFileError},
10-
kvsd, Config,
11+
kvsd,
1112
},
1213
};
1314

crates/synd_kvsd/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use synd_kvsd::{
55
cli::{self, ObservabilityOptions},
66
config::{self, ConfigResolver},
77
};
8-
use synd_o11y::{tracing_subscriber::initializer::TracingInitializer, OpenTelemetryGuard};
9-
use synd_stdx::io::color::{is_color_supported, ColorSupport};
8+
use synd_o11y::{OpenTelemetryGuard, tracing_subscriber::initializer::TracingInitializer};
9+
use synd_stdx::io::color::{ColorSupport, is_color_supported};
1010

1111
fn init_tracing(options: &ObservabilityOptions) -> Option<OpenTelemetryGuard> {
1212
let ObservabilityOptions {

crates/synd_kvsd/src/middleware/stack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::{
2-
middleware::{telemetry::Telemetry, Dispatcher, Middleware},
2+
middleware::{Dispatcher, Middleware, telemetry::Telemetry},
33
uow::UnitOfWork,
44
};
55

crates/synd_kvsd/src/table/table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use tracing::debug;
1010

1111
use crate::{
1212
table::{
13-
index::{Index, IndexError},
1413
Namespace,
14+
index::{Index, IndexError},
1515
},
1616
uow::{UnitOfWork, UowError, UowReceiver},
1717
};

crates/synd_kvsd_protocol/src/connection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ mod tests {
133133
use std::ops::Add;
134134

135135
use crate::{
136-
message::{Authenticate, Fail, FailCode, Ping, Set, Success},
137136
Key, Value,
137+
message::{Authenticate, Fail, FailCode, Ping, Set, Success},
138138
};
139139

140140
use super::*;

crates/synd_kvsd_protocol/src/message/frame.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::io;
22

33
use tokio::io::AsyncWriteExt;
44

5-
use crate::message::{spec, MessageType};
5+
use crate::message::{MessageType, spec};
66

77
pub(in crate::message) mod prefix {
88
pub(in crate::message) const MESSAGE_START: u8 = b'*';

crates/synd_kvsd_protocol/src/message/parse.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ impl Parser {
6969

7070
pub(super) mod parse {
7171
use nom::{
72+
IResult, Parser as _,
7273
bytes::streaming::{tag, take},
7374
combinator::{map, peek},
7475
number::streaming::{be_u64, u8},
7576
sequence::{pair, preceded, terminated},
76-
IResult, Parser as _,
7777
};
7878

7979
use crate::message::{frame::prefix, spec};
@@ -132,7 +132,7 @@ pub(super) mod parse {
132132
mod tests {
133133
use chrono::DateTime;
134134

135-
use crate::message::{frame::Frame, MessageType};
135+
use crate::message::{MessageType, frame::Frame};
136136

137137
use super::*;
138138

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::message::{parse::parse, MessageFrames, MessageType, ParseError};
1+
use crate::message::{MessageFrames, MessageType, ParseError, parse::parse};
22

33
/// `Authenticate` is a message in which client requests the server
44
/// to perform authentication process.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::fmt;
22

3-
use crate::message::{parse::parse, MessageFrames, MessageType, ParseError};
3+
use crate::message::{MessageFrames, MessageType, ParseError, parse::parse};
44

55
const UNDEFINED: &str = "UNDEFINED";
66
const UNAUTHENTICATED: &str = "UNAUTHENTICATED";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
2-
message::{frame::prefix, parse::parse, MessageFrames, MessageType, ParseError},
32
Time,
3+
message::{MessageFrames, MessageType, ParseError, frame::prefix, parse::parse},
44
};
55
use chrono::{DateTime, Utc};
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
2-
message::{parse::parse, MessageFrames, MessageType, ParseError},
32
Key, Value,
3+
message::{MessageFrames, MessageType, ParseError, parse::parse},
44
};
55

66
#[derive(Debug, Clone, PartialEq)]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
2-
message::{frame::prefix, parse::parse, MessageFrames, ParseError},
32
Value,
3+
message::{MessageFrames, ParseError, frame::prefix, parse::parse},
44
};
55

66
#[derive(Debug, Clone, PartialEq)]

crates/synd_o11y/src/opentelemetry/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod resource;
2-
pub use resource::{resource, Resource};
2+
pub use resource::{Resource, resource};
33

44
mod propagation;
55
pub use propagation::{http, init_propagation};

crates/synd_o11y/src/opentelemetry/resource.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use opentelemetry::KeyValue;
22
use opentelemetry_sdk::resource::EnvResourceDetector;
33
use opentelemetry_semantic_conventions::{
4-
resource::{SERVICE_NAME, SERVICE_NAMESPACE, SERVICE_VERSION},
54
SCHEMA_URL,
5+
resource::{SERVICE_NAME, SERVICE_NAMESPACE, SERVICE_VERSION},
66
};
77
use std::{borrow::Cow, time::Duration};
88

0 commit comments

Comments
 (0)