diff --git a/Cargo.toml b/Cargo.toml index adedb6d..31f3c6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "good_git" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] anyhow = "1.0.82" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 0193dee..c1bc0a6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.83.0" +channel = "1.85.0" diff --git a/src/main.rs b/src/main.rs index f054c80..3ed8ecb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Result}; +use anyhow::{Result, anyhow}; use good_git::{hash_object, repo::Repo}; use std::{fs, path::Path, path::PathBuf}; diff --git a/src/object.rs b/src/object.rs index 54a4a51..f308c5c 100644 --- a/src/object.rs +++ b/src/object.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Context, Result}; +use anyhow::{Context, Result, anyhow}; use flate2::read::ZlibDecoder; use sha1::{Digest, Sha1}; use std::{fs, io::prelude::*}; @@ -258,9 +258,9 @@ pub fn hash(s: &[u8]) -> String { mod tests { use crate::object::File; - use super::hash; use super::Blob; use super::Object; + use super::hash; #[test] fn test_object_parse_header() { assert_eq!( diff --git a/tests/git_test.rs b/tests/git_test.rs index cd4bad4..87167b0 100644 --- a/tests/git_test.rs +++ b/tests/git_test.rs @@ -1,4 +1,4 @@ -use flate2::{write::ZlibEncoder, Compression}; +use flate2::{Compression, write::ZlibEncoder}; use good_git::object::{Commit, Tree}; use good_git::repo::Repo; use rstest::fixture;