From ce98913d457f1a00118926335d48e1d69704166b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 23 Dec 2024 21:48:40 +0530 Subject: [PATCH] fix: upgrade to Rust 1.83.0 --- flake.nix | 2 +- rust-toolchain.toml | 2 +- src/config.rs | 2 +- src/logging.rs | 4 ++-- src/main.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index be78026..ef0377e 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ rustStable = (import fenix { inherit pkgs; }).fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk="; + sha256 = "sha256-s1RPtyvDGJaX/BisLT+ifVfuhDT1nZkZ1NcK8sbwELM="; }; craneLib = (crane.mkLib pkgs).overrideToolchain rustStable; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f0438a4..2f5ae5a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.82.0" +channel = "1.83.0" components = ["clippy", "rustfmt", "rust-src"] targets = ["x86_64-unknown-linux-gnu"] profile = "minimal" diff --git a/src/config.rs b/src/config.rs index 986d944..eddc887 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,6 @@ use std::str::FromStr; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use regex::Regex; use serde_derive::Deserialize; use tracing::trace; diff --git a/src/logging.rs b/src/logging.rs index 8694cd1..c9c01d9 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -1,12 +1,12 @@ +use tracing::Level; use tracing::dispatcher::SetGlobalDefaultError; use tracing::subscriber::set_global_default; -use tracing::Level; use tracing_subscriber::filter::Targets; #[cfg(not(feature = "journald"))] fn configure_tracing(filter: Targets) -> Result<(), SetGlobalDefaultError> { use tracing_subscriber::layer::SubscriberExt; - use tracing_subscriber::{fmt, Layer}; + use tracing_subscriber::{Layer, fmt}; let stdout_log = fmt::layer().pretty(); let subscriber = diff --git a/src/main.rs b/src/main.rs index eef705e..113c493 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,7 +6,7 @@ mod test; use std::path::PathBuf; -use anyhow::{anyhow, bail, Result}; +use anyhow::{Result, anyhow, bail}; use dirs::config_dir; use tracing::debug;