Skip to content

Commit

Permalink
build: bump Rust edition to 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
rami3l committed Feb 25, 2025
1 parent 7c33bd8 commit b493273
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [".", "crates/*"]
[workspace.package]
version = "0.22.0"
license = "GPL-3.0"
edition = "2021"
edition = "2024"

[workspace.dependencies]
itertools = "0.13.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/pacaptr-macros/src/compat_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ use std::{
};

use anyhow::Context;
use itertools::{chain, Itertools};
use itertools::{Itertools, chain};
use proc_macro2::{Span, TokenStream};
use regex::Regex;
use syn::{Error, Result};
use tabled::{settings::Style as TableStyle, Table, Tabled};
use tabled::{Table, Tabled, settings::Style as TableStyle};

const PM_IMPL_DIR: &str = "src/pm/";

Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
use std::{env, path::PathBuf};

use figment::{
Figment, Provider,
providers::{Env, Format, Toml},
util::bool_from_str_or_int,
Figment, Provider,
};
use serde::{Deserialize, Deserializer, Serialize};
use tap::prelude::*;
Expand Down
4 changes: 2 additions & 2 deletions src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use bytes::{Bytes, BytesMut};
use dialoguer::FuzzySelect;
use futures::prelude::*;
use indoc::indoc;
use itertools::{chain, Itertools};
use itertools::{Itertools, chain};
use regex::{RegexSet, RegexSetBuilder};
use tap::prelude::*;
use tokio::{
Expand Down Expand Up @@ -253,8 +253,8 @@ impl Cmd {
/// and [`Cmd::exec_checkall`] (otherwise).
#[doc = docs_errors_exec!()]
async fn exec_check_output(self, mute: bool, merge: bool) -> Result<Output> {
use tokio_stream::StreamExt;
use Error::{CmdJoinError, CmdNoHandleError, CmdSpawnError, CmdWaitError};
use tokio_stream::StreamExt;

fn make_reader(
src: Option<impl AsyncRead>,
Expand Down
2 changes: 1 addition & 1 deletion src/pm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ use tt_call::tt_call;
use crate::{
config::Config,
error::Result,
exec::{self, is_exe, Cmd, Mode, Output},
exec::{self, Cmd, Mode, Output, is_exe},
print::{println_quoted, prompt},
};

Expand Down
2 changes: 1 addition & 1 deletion src/print.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub(crate) mod style;

use std::fmt::{self, Debug, Display};

use console::{style, Style};
use console::{Style, style};
use dialoguer::theme::ColorfulTheme;

/// The right indentation to be applied on prompt prefixes.
Expand Down
4 changes: 2 additions & 2 deletions tests/common.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#![cfg(feature = "test")]
#![allow(clippy::dbg_macro, clippy::missing_panics_doc)]

use itertools::{chain, Itertools};
use itertools::{Itertools, chain};
pub use pacaptr_macros::test_dsl;
use regex::RegexBuilder;
use xshell::{cmd, Shell};
use xshell::{Shell, cmd};

#[derive(Debug)]
enum Input<'i> {
Expand Down

0 comments on commit b493273

Please sign in to comment.