From 811b34b0bedc993ad7f9be3c0764e021f670cf6e Mon Sep 17 00:00:00 2001
From: hal8174 <henning.lindemann@pm.me>
Date: Thu, 20 Feb 2025 22:17:54 +0100
Subject: [PATCH] cargo fix

---
 factorio-blueprint-generator/src/bin/assembly.rs               | 2 +-
 factorio-blueprint-generator/src/bin/generate_factory.rs       | 1 -
 factorio-layout/src/genetic_algorithm_v1.rs                    | 2 +-
 factorio-layout/src/layout.rs                                  | 2 +-
 factorio-layout/src/misc.rs                                    | 2 +-
 factorio-pathfinding/Cargo.toml                                | 2 +-
 factorio-pathfinding/src/belt_finding/mod.rs                   | 3 +--
 .../src/graph/wheighted_graph/shortest_path.rs                 | 2 +-
 factorio-pathfinding/src/priority_queue/mod.rs                 | 1 -
 9 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/factorio-blueprint-generator/src/bin/assembly.rs b/factorio-blueprint-generator/src/bin/assembly.rs
index 6cc4553..29ffb55 100644
--- a/factorio-blueprint-generator/src/bin/assembly.rs
+++ b/factorio-blueprint-generator/src/bin/assembly.rs
@@ -1,6 +1,6 @@
 use clap::Parser;
 use factorio_blueprint::{BlueprintString, encode};
-use factorio_blueprint_generator::assembly::{assembly_line, assembly_line_2_input};
+use factorio_blueprint_generator::assembly::assembly_line_2_input;
 use factorio_core::beltoptions::Beltspeed;
 
 #[derive(Parser)]
diff --git a/factorio-blueprint-generator/src/bin/generate_factory.rs b/factorio-blueprint-generator/src/bin/generate_factory.rs
index 2959e89..587952a 100644
--- a/factorio-blueprint-generator/src/bin/generate_factory.rs
+++ b/factorio-blueprint-generator/src/bin/generate_factory.rs
@@ -7,7 +7,6 @@ use factorio_core::prelude::*;
 use factorio_layout::{genetic_algorithm_v1::GeneticAlgorithm, valid_layout::ValidLayout};
 use factorio_pathfinding::belt_finding::ConflictAvoidance;
 use rand::{SeedableRng, rngs::SmallRng};
-use tracing_subscriber::{EnvFilter, fmt::format::FmtSpan};
 
 #[derive(Parser)]
 struct Args {
diff --git a/factorio-layout/src/genetic_algorithm_v1.rs b/factorio-layout/src/genetic_algorithm_v1.rs
index 1077546..292f11a 100644
--- a/factorio-layout/src/genetic_algorithm_v1.rs
+++ b/factorio-layout/src/genetic_algorithm_v1.rs
@@ -1,5 +1,5 @@
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
-use tracing::{Level, field::Empty, info, span, trace, warn};
+use tracing::{Level, field::Empty, span, trace, warn};
 
 use crate::{
     LayoutResult, Layouter,
diff --git a/factorio-layout/src/layout.rs b/factorio-layout/src/layout.rs
index 9ea4625..937e4e8 100644
--- a/factorio-layout/src/layout.rs
+++ b/factorio-layout/src/layout.rs
@@ -6,7 +6,7 @@ use factorio_core::{
 use factorio_pathfinding::belt_finding::{self, conflict_avoidance::ConflictAvoidance};
 use rand::{
     Rng,
-    seq::{IndexedRandom, SliceRandom},
+    seq::IndexedRandom,
 };
 use serde::{Deserialize, Serialize};
 use std::{sync::atomic::AtomicU32, time::Instant};
diff --git a/factorio-layout/src/misc.rs b/factorio-layout/src/misc.rs
index ca7787a..63c4ff4 100644
--- a/factorio-layout/src/misc.rs
+++ b/factorio-layout/src/misc.rs
@@ -3,7 +3,7 @@ use factorio_core::prelude::*;
 use factorio_pathfinding::{Connection, examples::HashMapMap};
 use rand::{
     Rng,
-    seq::{IndexedRandom, SliceRandom},
+    seq::IndexedRandom,
 };
 
 pub fn initally_set_blocks(
diff --git a/factorio-pathfinding/Cargo.toml b/factorio-pathfinding/Cargo.toml
index 278445c..7d0af0c 100644
--- a/factorio-pathfinding/Cargo.toml
+++ b/factorio-pathfinding/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "factorio-pathfinding"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/factorio-pathfinding/src/belt_finding/mod.rs b/factorio-pathfinding/src/belt_finding/mod.rs
index 9ed024a..d486be1 100644
--- a/factorio-pathfinding/src/belt_finding/mod.rs
+++ b/factorio-pathfinding/src/belt_finding/mod.rs
@@ -2,12 +2,11 @@ use crate::examples::HashMapMap;
 use crate::graph::wheighted_graph::shortest_path::a_star;
 use crate::graph::wheighted_graph::WheightedGraph;
 use crate::misc::Map;
-use crate::priority_queue::binary_heap::BinaryHeap;
 use crate::priority_queue::binary_heap::FastBinaryHeap;
 use crate::Connection;
 use crate::Map as _;
 use crate::SinglePathInput;
-use crate::{graph::wheighted_graph::shortest_path::dijkstra, SinglePathfinder};
+use crate::SinglePathfinder;
 use factorio_core::{prelude::*, visualize::Visualize};
 use serde::{Deserialize, Serialize};
 use tracing::span;
diff --git a/factorio-pathfinding/src/graph/wheighted_graph/shortest_path.rs b/factorio-pathfinding/src/graph/wheighted_graph/shortest_path.rs
index b232eeb..c5cf266 100644
--- a/factorio-pathfinding/src/graph/wheighted_graph/shortest_path.rs
+++ b/factorio-pathfinding/src/graph/wheighted_graph/shortest_path.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, fmt::Debug, hash::Hash, hash::Hasher};
 
-use tracing::{field::Empty, trace, trace_span};
+use tracing::{field::Empty, trace_span};
 
 use crate::priority_queue::PriorityQueue;
 
diff --git a/factorio-pathfinding/src/priority_queue/mod.rs b/factorio-pathfinding/src/priority_queue/mod.rs
index f881750..5e02acf 100644
--- a/factorio-pathfinding/src/priority_queue/mod.rs
+++ b/factorio-pathfinding/src/priority_queue/mod.rs
@@ -1,4 +1,3 @@
-use std::fmt::Debug;
 pub mod binary_heap;
 pub mod fibonacci_heap;