cargo: update to rust edition 2024 and bump MSRV to 1.85

radhermit · radhermit · commit d8ab58eda18f · 2025-04-26T06:06:41.000-06:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,8 +4,8 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Tim Harder <radhermit@gmail.com>"]
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 
 [workspace.lints.rust]
 unreachable_pub = "warn"
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -3,7 +3,7 @@ use std::process::ExitCode;
 
 use bugbite::output::verbose;
 use clap::Parser;
-use clap_verbosity_flag::{log::LevelFilter, Verbosity, WarnLevel};
+use clap_verbosity_flag::{Verbosity, WarnLevel, log::LevelFilter};
 use tracing_log::AsTrace;
 
 use crate::subcmds::Subcommand;
diff --git a/crates/cli/src/service/bugzilla/attachment/create.rs b/crates/cli/src/service/bugzilla/attachment/create.rs
@@ -4,8 +4,8 @@ use std::process::ExitCode;
 use bugbite::args::CsvOrStdin;
 use bugbite::objects::bugzilla::Flag;
 use bugbite::output::verbose;
-use bugbite::service::bugzilla::attachment::create::*;
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::attachment::create::*;
 use bugbite::traits::RequestSend;
 use byte_unit::Byte;
 use camino::Utf8PathBuf;
diff --git a/crates/cli/src/service/bugzilla/attachment/get.rs b/crates/cli/src/service/bugzilla/attachment/get.rs
@@ -2,7 +2,7 @@ use std::fs;
 use std::io::{IsTerminal, Write};
 use std::process::ExitCode;
 
-use anyhow::{anyhow, Context};
+use anyhow::{Context, anyhow};
 use bugbite::args::MaybeStdinVec;
 use bugbite::service::bugzilla::Bugzilla;
 use bugbite::traits::RequestSend;
diff --git a/crates/cli/src/service/bugzilla/attachment/update.rs b/crates/cli/src/service/bugzilla/attachment/update.rs
@@ -3,8 +3,8 @@ use std::process::ExitCode;
 
 use bugbite::args::MaybeStdinVec;
 use bugbite::objects::bugzilla::Flag;
-use bugbite::service::bugzilla::attachment::update::*;
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::attachment::update::*;
 use bugbite::traits::RequestSend;
 use clap::Args;
 
diff --git a/crates/cli/src/service/bugzilla/comment.rs b/crates/cli/src/service/bugzilla/comment.rs
@@ -2,9 +2,9 @@ use std::io::{IsTerminal, Write};
 use std::process::ExitCode;
 
 use bugbite::args::MaybeStdinVec;
-use bugbite::output::{Render, COLUMNS};
-use bugbite::service::bugzilla::comment::*;
+use bugbite::output::{COLUMNS, Render};
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::comment::*;
 use bugbite::time::TimeDeltaOrStatic;
 use bugbite::traits::RequestSend;
 use clap::Args;
diff --git a/crates/cli/src/service/bugzilla/create.rs b/crates/cli/src/service/bugzilla/create.rs
@@ -4,8 +4,8 @@ use std::process::ExitCode;
 use bugbite::args::MaybeStdinVec;
 use bugbite::objects::bugzilla::Flag;
 use bugbite::output::verbose;
-use bugbite::service::bugzilla::create::*;
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::create::*;
 use bugbite::traits::{Merge, RequestSend, RequestTemplate};
 use bugbite::utils::is_terminal;
 use clap::Args;
diff --git a/crates/cli/src/service/bugzilla/history.rs b/crates/cli/src/service/bugzilla/history.rs
@@ -2,9 +2,9 @@ use std::io::{IsTerminal, Write};
 use std::process::ExitCode;
 
 use bugbite::args::MaybeStdinVec;
-use bugbite::output::{Render, COLUMNS};
-use bugbite::service::bugzilla::history::*;
+use bugbite::output::{COLUMNS, Render};
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::history::*;
 use bugbite::time::TimeDeltaOrStatic;
 use bugbite::traits::RequestSend;
 use clap::Args;
diff --git a/crates/cli/src/service/bugzilla/update.rs b/crates/cli/src/service/bugzilla/update.rs
@@ -8,8 +8,8 @@ use anyhow::Context;
 use bugbite::args::{MaybeStdin, MaybeStdinVec};
 use bugbite::objects::bugzilla::Flag;
 use bugbite::output::verbose;
-use bugbite::service::bugzilla::update::*;
 use bugbite::service::bugzilla::Bugzilla;
+use bugbite::service::bugzilla::update::*;
 use bugbite::traits::{Merge, RequestSend, RequestTemplate};
 use camino::Utf8PathBuf;
 use clap::{Args, ValueHint};
diff --git a/crates/cli/src/service/github/search.rs b/crates/cli/src/service/github/search.rs
@@ -4,8 +4,8 @@ use std::process::ExitCode;
 use bugbite::args::Csv;
 use bugbite::output::COLUMNS;
 use bugbite::query::Order;
-use bugbite::service::github::search::{OrderField, Parameters};
 use bugbite::service::github::Github;
+use bugbite::service::github::search::{OrderField, Parameters};
 use bugbite::traits::{Merge, RequestSend};
 use bugbite::utils::is_terminal;
 use clap::Args;
diff --git a/crates/cli/src/subcmds/completion.rs b/crates/cli/src/subcmds/completion.rs
@@ -3,7 +3,7 @@ use std::{fs, io};
 
 use camino::Utf8PathBuf;
 use clap::{Args, CommandFactory, ValueEnum};
-use clap_complete::{generate, generate_to, Shell};
+use clap_complete::{Shell, generate, generate_to};
 
 #[derive(Debug, Args)]
 #[clap(next_help_heading = "Completion options")]
diff --git a/crates/cli/src/subcmds/show/connections.rs b/crates/cli/src/subcmds/show/connections.rs
@@ -5,8 +5,8 @@ use std::process::ExitCode;
 use bugbite::config::Config;
 use bugbite::service::ServiceKind;
 use bugbite::traits::WebClient;
-use clap::builder::{PossibleValuesParser, TypedValueParser};
 use clap::Args;
+use clap::builder::{PossibleValuesParser, TypedValueParser};
 use strum::{IntoEnumIterator, VariantNames};
 
 #[derive(Args, Debug)]
diff --git a/crates/cli/src/utils.rs b/crates/cli/src/utils.rs
@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 use std::env;
 use std::ffi::OsStr;
-use std::io::{stderr, stdin, BufRead, Write};
+use std::io::{BufRead, Write, stderr, stdin};
 use std::process::{Command, ExitStatus, Stdio};
 
 use anyhow::{Context, Result};
diff --git a/crates/cli/tests/bite/main.rs b/crates/cli/tests/bite/main.rs
@@ -1,7 +1,7 @@
 use std::sync::LazyLock;
 use std::{env, fs};
 
-use bugbite::test::{build_path, TestServer};
+use bugbite::test::{TestServer, build_path};
 use camino::Utf8PathBuf;
 use indexmap::IndexSet;
 use itertools::Itertools;
diff --git a/crates/cli/tests/bite/service/bugzilla.rs b/crates/cli/tests/bite/service/bugzilla.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use camino::Utf8PathBuf;
 use predicates::prelude::*;
-use wiremock::{matchers, ResponseTemplate};
+use wiremock::{ResponseTemplate, matchers};
 
 use super::*;
 
diff --git a/crates/cli/tests/bite/service/bugzilla/attachment/create.rs b/crates/cli/tests/bite/service/bugzilla/attachment/create.rs
@@ -1,7 +1,7 @@
 use std::{env, fs};
 
 use predicates::prelude::*;
-use tempfile::{tempdir, NamedTempFile};
+use tempfile::{NamedTempFile, tempdir};
 
 use super::*;
 
diff --git a/crates/cli/tests/bite/service/bugzilla/attachment/get.rs b/crates/cli/tests/bite/service/bugzilla/attachment/get.rs
@@ -1,7 +1,7 @@
 use std::{env, fs};
 
 use predicates::prelude::*;
-use tempfile::{tempdir, NamedTempFile};
+use tempfile::{NamedTempFile, tempdir};
 
 use super::*;
 
diff --git a/crates/cli/tests/bite/service/bugzilla/version.rs b/crates/cli/tests/bite/service/bugzilla/version.rs
@@ -1,5 +1,5 @@
 use predicates::prelude::*;
-use wiremock::{matchers, ResponseTemplate};
+use wiremock::{ResponseTemplate, matchers};
 
 use super::*;
 
diff --git a/crates/cli/tests/bite/service/redmine/get.rs b/crates/cli/tests/bite/service/redmine/get.rs
@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use predicates::prelude::*;
-use wiremock::{matchers, ResponseTemplate};
+use wiremock::{ResponseTemplate, matchers};
 
 use super::*;
 
diff --git a/crates/lib/src/config.rs b/crates/lib/src/config.rs
@@ -5,10 +5,10 @@ use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
+use crate::Error;
 use crate::service::{self, ClientParameters, ServiceKind};
 use crate::traits::WebClient;
 use crate::utils::config_dir;
-use crate::Error;
 
 /// Bundled service data.
 static SERVICES_DATA: &str = include_str!(concat!(env!("OUT_DIR"), "/services.toml"));
diff --git a/crates/lib/src/error/python.rs b/crates/lib/src/error/python.rs
@@ -1,5 +1,5 @@
 use pyo3::exceptions::PyException;
-use pyo3::{create_exception, PyErr};
+use pyo3::{PyErr, create_exception};
 
 use super::Error;
 
diff --git a/crates/lib/src/objects.rs b/crates/lib/src/objects.rs
@@ -7,8 +7,8 @@ use base64::prelude::*;
 use regex::Regex;
 use serde_with::{DeserializeFromStr, SerializeDisplay};
 
-use crate::traits::Contains;
 use crate::Error;
+use crate::traits::Contains;
 
 pub mod bugzilla;
 pub mod github;
diff --git a/crates/lib/src/objects/bugzilla.rs b/crates/lib/src/objects/bugzilla.rs
@@ -10,17 +10,17 @@ use itertools::{Either, Itertools};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use serde_with::{
-    serde_as, skip_serializing_none, BoolFromInt, DefaultOnError, DefaultOnNull,
-    DeserializeFromStr, SerializeDisplay,
+    BoolFromInt, DefaultOnError, DefaultOnNull, DeserializeFromStr, SerializeDisplay, serde_as,
+    skip_serializing_none,
 };
 use strum::{Display, EnumString};
 
+use crate::Error;
 use crate::serde::{byte_object, non_empty_str};
 use crate::service::bugzilla::{BugField, FilterField, GroupField, UNSET_VALUES};
 use crate::traits::RenderSearch;
-use crate::Error;
 
-use super::{stringify, Base64};
+use super::{Base64, stringify};
 
 /// A file attachment on a bug.
 #[serde_as]
diff --git a/crates/lib/src/objects/redmine.rs b/crates/lib/src/objects/redmine.rs
@@ -6,7 +6,7 @@ use chrono::prelude::*;
 use indexmap::IndexSet;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use serde_with::{serde_as, skip_serializing_none, DefaultOnNull};
+use serde_with::{DefaultOnNull, serde_as, skip_serializing_none};
 
 use std::fmt;
 
diff --git a/crates/lib/src/output.rs b/crates/lib/src/output.rs
@@ -1,10 +1,10 @@
 use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::io::{self, IsTerminal, Write};
-use std::sync::{atomic::AtomicBool, LazyLock};
+use std::sync::{LazyLock, atomic::AtomicBool};
 
 use crossterm::terminal;
-use futures_util::{pin_mut, Stream, TryStreamExt};
+use futures_util::{Stream, TryStreamExt, pin_mut};
 use itertools::Itertools;
 use serde::Serialize;
 use unicode_segmentation::UnicodeSegmentation;
diff --git a/crates/lib/src/query.rs b/crates/lib/src/query.rs
@@ -5,8 +5,8 @@ use std::str::FromStr;
 use ordered_multimap::ListOrderedMultimap;
 use serde_with::{DeserializeFromStr, SerializeDisplay};
 
-use crate::traits::Api;
 use crate::Error;
+use crate::traits::Api;
 
 #[derive(Debug, Default)]
 pub(crate) struct Query(ListOrderedMultimap<String, String>);
diff --git a/crates/lib/src/service.rs b/crates/lib/src/service.rs
@@ -9,8 +9,8 @@ use serde_with::{DeserializeFromStr, SerializeDisplay};
 use strum::{AsRefStr, Display, EnumIter, EnumString, VariantNames};
 use url::Url;
 
-use crate::traits::{Merge, MergeOption, WebClient};
 use crate::Error;
+use crate::traits::{Merge, MergeOption, WebClient};
 
 pub mod bugzilla;
 pub mod github;
diff --git a/crates/lib/src/service/bugzilla.rs b/crates/lib/src/service/bugzilla.rs
@@ -11,9 +11,9 @@ use strum::{Display, EnumIter, EnumString, IntoEnumIterator, VariantNames};
 use tracing::{debug, trace};
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::{Bug, BugzillaField};
 use crate::traits::{Api, Merge, MergeOption, WebClient, WebService};
-use crate::Error;
 
 use super::{Client, ClientParameters, ServiceKind};
 
diff --git a/crates/lib/src/service/bugzilla/attachment/create.rs b/crates/lib/src/service/bugzilla/attachment/create.rs
@@ -10,11 +10,11 @@ use serde_with::skip_serializing_none;
 use strum::{Display, EnumIter, EnumString, VariantNames};
 use url::Url;
 
-use crate::objects::bugzilla::Flag;
+use crate::Error;
 use crate::objects::Base64;
+use crate::objects::bugzilla::Flag;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 /// Compression variants supported by attachments.
 #[derive(
diff --git a/crates/lib/src/service/bugzilla/attachment/get.rs b/crates/lib/src/service/bugzilla/attachment/get.rs
@@ -1,9 +1,9 @@
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Attachment;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/attachment/get_item.rs b/crates/lib/src/service/bugzilla/attachment/get_item.rs
@@ -1,10 +1,10 @@
 use serde_json::Value;
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Attachment;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/attachment/update.rs b/crates/lib/src/service/bugzilla/attachment/update.rs
@@ -3,10 +3,10 @@ use serde_json::Value;
 use serde_with::skip_serializing_none;
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Flag;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/comment.rs b/crates/lib/src/service/bugzilla/comment.rs
@@ -1,11 +1,11 @@
 use serde_json::Value;
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Comment;
 use crate::service::bugzilla::Bugzilla;
 use crate::time::TimeDeltaOrStatic;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/create.rs b/crates/lib/src/service/bugzilla/create.rs
@@ -5,10 +5,10 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 
+use crate::Error;
 use crate::objects::bugzilla::{Bug, Flag};
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, Merge, MergeOption, RequestSend, RequestTemplate, WebService};
-use crate::Error;
 
 #[derive(Serialize, Debug, Clone, PartialEq)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/fields.rs b/crates/lib/src/service/bugzilla/fields.rs
@@ -1,7 +1,7 @@
+use crate::Error;
 use crate::objects::bugzilla::BugzillaField;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/get.rs b/crates/lib/src/service/bugzilla/get.rs
@@ -1,10 +1,10 @@
 use serde_json::Value;
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Bug;
 use crate::service::bugzilla::Bugzilla;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 use super::{attachment, comment, history};
 
diff --git a/crates/lib/src/service/bugzilla/history.rs b/crates/lib/src/service/bugzilla/history.rs
@@ -1,11 +1,11 @@
 use serde_json::Value;
 use url::Url;
 
+use crate::Error;
 use crate::objects::bugzilla::Event;
 use crate::service::bugzilla::Bugzilla;
 use crate::time::TimeDeltaOrStatic;
 use crate::traits::{InjectAuth, RequestSend, WebService};
-use crate::Error;
 
 #[derive(Debug)]
 pub struct Request {
diff --git a/crates/lib/src/service/bugzilla/search.rs b/crates/lib/src/service/bugzilla/search.rs
diff --git a/crates/lib/src/service/bugzilla/update.rs b/crates/lib/src/service/bugzilla/update.rs
diff --git a/crates/lib/src/service/bugzilla/version.rs b/crates/lib/src/service/bugzilla/version.rs
diff --git a/crates/lib/src/service/github.rs b/crates/lib/src/service/github.rs
diff --git a/crates/lib/src/service/redmine.rs b/crates/lib/src/service/redmine.rs
diff --git a/crates/lib/src/service/redmine/get.rs b/crates/lib/src/service/redmine/get.rs
diff --git a/crates/lib/src/service/redmine/search.rs b/crates/lib/src/service/redmine/search.rs
diff --git a/crates/lib/src/test.rs b/crates/lib/src/test.rs
diff --git a/crates/lib/src/time.rs b/crates/lib/src/time.rs
diff --git a/crates/lib/src/time/delta.rs b/crates/lib/src/time/delta.rs
diff --git a/crates/lib/src/time/static.rs b/crates/lib/src/time/static.rs
diff --git a/crates/lib/src/traits.rs b/crates/lib/src/traits.rs
diff --git a/crates/python/src/bugzilla.rs b/crates/python/src/bugzilla.rs
diff --git a/crates/python/src/redmine.rs b/crates/python/src/redmine.rs
diff --git a/crates/python/src/utils.rs b/crates/python/src/utils.rs
diff --git a/crates/tui/src/main.rs b/crates/tui/src/main.rs
