chore: new formatter

Cargo.toml

@@ -9,15 +9,15 @@ description = "Implementation of ideal unique factorization of quadratic integer
 repository = "https://github.com/yhx-12243/q"
 
 [dependencies]
-anyhow = { version = "1.0.86", features = ["backtrace"] }
-clap = { version = "4.5.15", features = ["derive", "unicode", "wrap_help", "env", "string", "unstable-v5"] }
-clap_derive = { version = "4.5.13", features = ["unstable-v5"] }
+anyhow = { version = "1.0.89", features = ["backtrace"] }
+clap = { version = "4.5.18", features = ["derive", "unicode", "wrap_help", "env", "string", "unstable-v5"] }
+clap_derive = { version = "4.5.18", features = ["unstable-v5"] }
 hashbrown = { version = "0.14.5", features = ["serde"] }
 nix = { version = "0.29.0", features = ["signal"] }
 num = { version = "0.4.3", features = ["rand"] }
 rand = { version = "0.8.5", features = ["log", "nightly"] }
-serde = { version = "1.0.206", features = ["derive"] }
-serde_json = { version = "1.0.124", features = ["float_roundtrip"] }
+serde = { version = "1.0.210", features = ["derive"] }
+serde_json = { version = "1.0.128", features = ["float_roundtrip"] }
 smallvec = { version = "1.13.2", features = ["const_new", "may_dangle", "specialization", "union"] }
 
 [lints.rust]

apply_patch.py

@@ -100,7 +100,7 @@ def patch_cargo(identifier, patch, crates_io):
 def patch_git(identifier, patch, cargo_git):
     name, version = identifier.rsplit('-', 1)
     for d in cargo_git:
-        if d.name.startswith(name):
+        if d.name.startswith(name) and (d / version).is_dir():
             return (
                 f'\x1b[32m======== Applying \x1b[1;35m{identifier}\x1b[32m ========\x1b[0m',
                 patch_inner(patch, d / version),

src/factor.rs

@@ -1,14 +1,14 @@
 use nix::{
-    sys::signal::{kill, signal, SigHandler, Signal},
+    sys::signal::{SigHandler, Signal, kill, signal},
     unistd::Pid,
 };
 use num::{BigUint, One};
 use serde::Deserialize;
 use std::{
     borrow::Cow,
     collections::{
-        btree_map::Entry::{Occupied, Vacant},
         BTreeMap,
+        btree_map::Entry::{Occupied, Vacant},
     },
     fs,
     io::{BufRead, BufReader, Write},

src/ideal.rs

@@ -1,10 +1,10 @@
 use std::{cmp::Ordering, fmt::Formatter, io, str::FromStr};
 
 use num::{
-    bigint::{IntDigits, Sign},
     BigInt, BigUint, Integer, One, Zero,
+    bigint::{IntDigits, Sign},
 };
-use smallvec::{smallvec_inline, SmallVec};
+use smallvec::{SmallVec, smallvec_inline};
 
 use crate::{discriminant, factor::factor, pell, qi::QI, qr::quadratic_residue};
 

src/main.rs

@@ -7,7 +7,6 @@
     integer_sign_cast,
     isqrt,
     let_chains,
-    raw_ref_op,
     slice_ptr_get,
     stmt_expr_attributes,
 )]
@@ -70,7 +69,7 @@ fn main() -> anyhow::Result<()> {
     ideal.reduce();
 
     {
-        use core::fmt::{rt::Argument, Arguments};
+        use core::fmt::{Arguments, rt::Argument};
         use std::io::Write;
 
         let fmt = if plain_tex { Ideal::tex } else { Ideal::latex };

src/qi.rs

@@ -1,6 +1,6 @@
 use std::fmt::{Display, Formatter, Write};
 
-use num::{bigint::Sign, BigInt, BigUint, Integer, One, Signed, Zero};
+use num::{BigInt, BigUint, Integer, One, Signed, Zero, bigint::Sign};
 
 use crate::discriminant;
 
@@ -243,7 +243,7 @@ mod tests {
 
     use num::BigInt;
 
-    use super::{discriminant, QI};
+    use super::{QI, discriminant};
 
     fn check(qi: QI, s: &str) {
         let mut t = String::new();

src/qr.rs

@@ -1,8 +1,8 @@
 use std::ptr::NonNull;
 
 use num::{
-    bigint::{IntDigits, RandBigInt},
     BigUint, Integer, One, Zero,
+    bigint::{IntDigits, RandBigInt},
 };
 use rand::thread_rng;