Skip to content

Commit 4888209

Browse files
authored
chore: cleanup dependencies (#62)
- Updated dependencies to their latest versions. - Updated library dependencies to point at the minimum semver compatible versions rather than a specific patch version to make this more broadly compatible - Changed to using clap-verbosity-flag instead of clap-verbosity as v3 now supports tracing - Fix a couple of doc warnings
1 parent a22fed8 commit 4888209

File tree

8 files changed

+160
-201
lines changed

8 files changed

+160
-201
lines changed

Cargo.lock

Lines changed: 132 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ keywords = ["webfinger", "client", "library", "rust", "cli"]
1515
readme = "README.md"
1616

1717
[workspace.dependencies]
18-
axum = { version = "0.8.3", default-features = false }
19-
actix-web = { version = "4.10.2" }
20-
color-eyre = "0.6.3"
21-
http = "1.3.1"
22-
reqwest = { version = "0.12.15" }
23-
tokio = "1.44.2"
24-
tracing = "0.1.41"
25-
tracing-error = "0.2.1"
26-
tracing-subscriber = "0.3.19"
18+
axum = { version = "0.8.4", default-features = false }
19+
actix-web = { version = "4" }
20+
color-eyre = "0.6"
21+
http = "1"
22+
reqwest = { version = "0.12" }
23+
tokio = "1.13.1"
24+
tracing = "0.1.37"
25+
tracing-error = "0.2"
26+
tracing-subscriber = "0.3"
2727
webfinger-rs = { path = "webfinger-rs", version = "0.0.14" }

webfinger-cli/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ readme.workspace = true
1414
[dependencies]
1515
clap = { version = "4.5.37", features = ["derive", "wrap_help"] }
1616
clap-cargo = "0.15.2"
17-
clap-verbosity = "2.1.0"
17+
clap-verbosity-flag = { version = "3.0.2", default-features = false, features = [
18+
"tracing",
19+
] }
1820
color-eyre.workspace = true
1921
colored_json = "5.0.0"
2022
http.workspace = true
2123
reqwest.workspace = true
2224
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
2325
tracing.workspace = true
2426
tracing-error.workspace = true
25-
tracing-log = "0.2.0"
2627
tracing-subscriber = { workspace = true, features = ["env-filter"] }
2728
webfinger-rs = { workspace = true, features = ["reqwest"] }
2829

webfinger-cli/src/main.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ use std::io;
22

33
use clap::{Args, Parser};
44
use clap_cargo::style::CLAP_STYLING;
5-
use clap_verbosity::{InfoLevel, Verbosity};
5+
use clap_verbosity_flag::{InfoLevel, Verbosity};
66
use color_eyre::Result;
77
use color_eyre::eyre::{Context, bail};
88
use colored_json::ToColoredJson;
99
use http::Uri;
1010
use tracing::{debug, warn};
11-
use tracing_log::AsTrace;
1211
use webfinger_rs::{Rel, WebFingerRequest};
1312

1413
/// A simple CLI for fetching webfinger resources
@@ -51,9 +50,8 @@ struct FetchCommand {
5150
async fn main() -> Result<()> {
5251
color_eyre::install()?;
5352
let args = Cli::parse();
54-
let log_level = args.verbosity.log_level_filter().as_trace();
5553
tracing_subscriber::fmt()
56-
.with_max_level(log_level)
54+
.with_max_level(args.verbosity)
5755
.with_writer(io::stderr)
5856
.init();
5957
args.fetch_command.execute().await?;

webfinger-rs/Cargo.toml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ keywords.workspace = true
1111
authors.workspace = true
1212

1313
[features]
14-
#! ## Features
15-
#!
1614
## No features are enabled by default.
17-
default = []
15+
default = ["document-features"]
1816

1917
## Provides integration with the Actix web framework.
2018
actix = ["dep:actix-web"]
@@ -25,22 +23,22 @@ reqwest = ["dep:reqwest"]
2523

2624
[dependencies]
2725
actix-web = { workspace = true, optional = true }
28-
async-convert = "1.0.0"
26+
async-convert = "1.0"
2927
axum = { workspace = true, optional = true, features = ["json"] }
30-
axum-extra = { version = "0.10.1", optional = true, features = ["query"] }
31-
document-features = "0.2.11"
28+
axum-extra = { version = "0.10", optional = true, features = ["query"] }
29+
document-features = { version = "0.2", optional = true }
3230
http.workspace = true
33-
nutype = { version = "0.6.1", features = ["serde"] }
34-
percent-encoding = "2.3.1"
31+
nutype = { version = "0.6", features = ["serde"] }
32+
percent-encoding = "2.3"
3533
reqwest = { workspace = true, optional = true, features = ["json"] }
36-
serde = { version = "1.0.219", features = ["derive"] }
37-
serde_json = "1.0.140"
38-
serde_with = "3.12.0"
34+
serde = { version = "1.0.184", features = ["derive"] }
35+
serde_json = "1.0.45"
36+
serde_with = "3.12"
3937
tracing.workspace = true
40-
thiserror = "2.0.12"
38+
thiserror = "2"
4139

4240
[dev-dependencies]
43-
actix-web = { workspace = true, features = ["rustls-0_23"] }
41+
actix-web = { version = "4.11.0", features = ["rustls-0_23"] }
4442
actix-tls = { version = "3.4.0", features = ["rustls-0_23"] }
4543
axum = { workspace = true, default-features = true }
4644
color-eyre.workspace = true

webfinger-rs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
//! cargo install webfinger-cli
2626
//! webfinger acct:[email protected] --rel http://webfinger.net/rel/avatar
2727
//! ```
28-
#![doc = document_features::document_features!()]
2928
//!
29+
#![cfg_attr(feature = "document-features", doc = concat!("## Features\n\n", document_features::document_features!()))]
3030
//! # Client Example
3131
//!
3232
//! The following example connects to the WebFinger server at `example.com` and requests the profile

webfinger-rs/src/types/request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl Request {
8181
}
8282
}
8383

84-
/// Creates a new [`WebFingerBuilder`] for a WebFinger request.
84+
/// Creates a new [`Builder`] for a WebFinger request.
8585
pub fn builder<U>(uri: U) -> Result<Builder, Error>
8686
where
8787
Uri: TryFrom<U>,

webfinger-rs/src/types/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Response {
9393
}
9494
}
9595

96-
/// Create a new [`WebFingerBuilder`] with the given subject.
96+
/// Create a new [`Builder`] with the given subject.
9797
///
9898
/// # Examples
9999
///

0 commit comments

Comments
 (0)