From 775fcb2d1b6adcd8aca3196ebdd1b2b0f16818cb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 21:44:10 +0100
Subject: [PATCH] treewide: cargo fmt with 1.85

---
 crates/nbt/src/region.rs   | 4 ++--
 crates/resource/src/lib.rs | 2 +-
 crates/types/src/lib.rs    | 8 ++++----
 src/core/mod.rs            | 8 +++++---
 src/core/tile_renderer.rs  | 2 +-
 src/world/chunk.rs         | 4 ++--
 src/world/json_text.rs     | 2 +-
 src/world/section.rs       | 8 ++------
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/crates/nbt/src/region.rs b/crates/nbt/src/region.rs
index 8a52b9d..1325919 100644
--- a/crates/nbt/src/region.rs
+++ b/crates/nbt/src/region.rs
@@ -2,11 +2,11 @@
 
 use std::{
 	fs::File,
-	io::{prelude::*, SeekFrom},
+	io::{SeekFrom, prelude::*},
 	path::Path,
 };
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use flate2::read::ZlibDecoder;
 use serde::de::DeserializeOwned;
 
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 01b460b..86cfb0f 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -11,7 +11,7 @@ mod legacy_block_types;
 use std::collections::HashMap;
 
 use bincode::{BorrowDecode, Decode, Encode};
-use enumflags2::{bitflags, BitFlags};
+use enumflags2::{BitFlags, bitflags};
 
 /// Flags describing special properties of [BlockType]s
 #[bitflags]
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index e770f6a..f2dc0e1 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -48,10 +48,10 @@ macro_rules! coord_type {
 			/// Returns an iterator over all possible values of the type
 			#[inline]
 			pub fn iter() -> impl DoubleEndedIterator<Item = $t<AXIS>>
-			       + ExactSizeIterator
-			       + FusedIterator
-			       + Clone
-			       + Debug {
+			+ ExactSizeIterator
+			+ FusedIterator
+			+ Clone
+			+ Debug {
 				(0..Self::MAX as u8).map($t)
 			}
 		}
diff --git a/src/core/mod.rs b/src/core/mod.rs
index a16f620..fce2cb5 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -205,8 +205,10 @@ pub fn cli() -> Result<()> {
 	if config.num_threads != config.num_threads_initial {
 		pool = setup_threads(config.num_threads)?;
 	}
-	pool.install(move || loop {
-		wait_watcher(&args, &watch_channel)?;
-		generate(&config, &rt)?;
+	pool.install(move || {
+		loop {
+			wait_watcher(&args, &watch_channel)?;
+			generate(&config, &rt)?;
+		}
 	})
 }
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index e990a63..9d7e188 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -16,7 +16,7 @@ use tracing::{debug, info};
 use super::{common::*, region_group::RegionGroup};
 use crate::{
 	io::{fs, storage},
-	resource::{block_color, needs_biome, Colorf},
+	resource::{Colorf, block_color, needs_biome},
 	types::*,
 	util::coord_offset,
 };
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index daee023..c4744d0 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -4,11 +4,11 @@
 //! over different data versions as much as possible.
 
 use std::{
-	collections::{btree_map, BTreeMap},
+	collections::{BTreeMap, btree_map},
 	iter::{self, FusedIterator},
 };
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 
 use super::{block_entity::BlockEntity, de, section::*};
 use crate::{
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index 6a2d8ba..7d3ff3a 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -185,9 +185,9 @@ mod json_color {
 
 	use minedmap_resource::Color;
 	use serde::{
+		Deserializer, Serializer,
 		de::{self, Visitor},
 		ser::Error as _,
-		Deserializer, Serializer,
 	};
 
 	/// Named JSON text colors
diff --git a/src/world/section.rs b/src/world/section.rs
index 845ddae..dc5c9a6 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -5,7 +5,7 @@
 
 use std::fmt::Debug;
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use num_integer::div_rem;
 use tracing::debug;
 
@@ -400,10 +400,6 @@ impl<'a> BlockLight<'a> {
 		let (offset, nibble) = div_rem(coords.offset(), 2);
 		let byte = block_light[offset] as u8;
 
-		if nibble == 1 {
-			byte >> 4
-		} else {
-			byte & 0xf
-		}
+		if nibble == 1 { byte >> 4 } else { byte & 0xf }
 	}
 }