Rust 2024 Edition formatting

Author: maneatingape

rustfmt.toml

@@ -1 +1,2 @@
+style_edition = "2024"
 use_small_heuristics = "Max"

src/year2016/day05.rs

@@ -6,8 +6,8 @@
 //! [`Year 2015 Day 4`]: crate::year2015::day04
 use crate::util::md5::*;
 use crate::util::thread::*;
-use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 use std::sync::Mutex;
+use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 
 struct Shared {
     prefix: String,

src/year2016/day07.rs

@@ -38,11 +38,7 @@ pub fn part1(input: &[u8]) -> usize {
         }
     }
 
-    if positive && !negative {
-        count + 1
-    } else {
-        count
-    }
+    if positive && !negative { count + 1 } else { count }
 }
 
 pub fn part2(input: &[u8]) -> usize {
@@ -84,9 +80,5 @@ pub fn part2(input: &[u8]) -> usize {
         }
     }
 
-    if positive {
-        count + 1
-    } else {
-        count
-    }
+    if positive { count + 1 } else { count }
 }

src/year2016/day14.rs

@@ -5,8 +5,8 @@
 use crate::util::md5::*;
 use crate::util::thread::*;
 use std::collections::{BTreeMap, BTreeSet};
-use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
 use std::sync::Mutex;
+use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
 
 /// Atomics can be safely shared between threads.
 struct Shared<'a> {

src/year2017/day14.rs

@@ -6,8 +6,8 @@
 //! [`Day 10`]: crate::year2017::day10
 //! [`Day 12`]: crate::year2017::day12
 use crate::util::thread::*;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Mutex;
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 /// Atomics can be safely shared between threads.
 pub struct Shared {

src/year2017/day15.rs

@@ -11,7 +11,7 @@ use crate::util::iter::*;
 use crate::util::math::*;
 use crate::util::parse::*;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::mpsc::{Receiver, Sender, channel};
 use std::thread;
 
 const PART_ONE: usize = 40_000_000;

src/year2018/day14.rs

@@ -12,7 +12,7 @@
 //! * Vector processing of recipes using techniques similar to SIMD.
 use crate::util::parse::*;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::mpsc::{Receiver, Sender, channel};
 use std::thread;
 
 type Input = (String, usize);

src/year2018/day15.rs

@@ -80,7 +80,7 @@ use crate::util::grid::*;
 use crate::util::point::*;
 use crate::util::thread::*;
 use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
-use std::sync::mpsc::{channel, Sender};
+use std::sync::mpsc::{Sender, channel};
 
 const READING_ORDER: [Point; 4] = [UP, LEFT, RIGHT, DOWN];
 

src/year2018/day19.rs

@@ -114,9 +114,5 @@ fn divisor_sum(mut n: u32) -> u32 {
     // If `n` is one then the greatest prime factor was repeated so has already been included in
     // the sum and we can just return it directly. Otherwise `n` is the unique greatest prime
     // factor and must be added to the sum.
-    if n == 1 {
-        sum
-    } else {
-        sum * (1 + n)
-    }
+    if n == 1 { sum } else { sum * (1 + n) }
 }

src/year2018/day24.rs

@@ -11,7 +11,7 @@ use crate::util::hash::*;
 use crate::util::parse::*;
 use crate::util::thread::*;
 use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
-use std::sync::mpsc::{channel, Sender};
+use std::sync::mpsc::{Sender, channel};
 
 pub struct Input {
     immune: Vec<Group>,