cargo fix
This commit is contained in:
parent
cb8d643c78
commit
811b34b0be
9 changed files with 7 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use factorio_blueprint::{BlueprintString, encode};
|
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;
|
use factorio_core::beltoptions::Beltspeed;
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ use factorio_core::prelude::*;
|
||||||
use factorio_layout::{genetic_algorithm_v1::GeneticAlgorithm, valid_layout::ValidLayout};
|
use factorio_layout::{genetic_algorithm_v1::GeneticAlgorithm, valid_layout::ValidLayout};
|
||||||
use factorio_pathfinding::belt_finding::ConflictAvoidance;
|
use factorio_pathfinding::belt_finding::ConflictAvoidance;
|
||||||
use rand::{SeedableRng, rngs::SmallRng};
|
use rand::{SeedableRng, rngs::SmallRng};
|
||||||
use tracing_subscriber::{EnvFilter, fmt::format::FmtSpan};
|
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
struct Args {
|
struct Args {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use rayon::iter::{IntoParallelIterator, ParallelIterator};
|
use rayon::iter::{IntoParallelIterator, ParallelIterator};
|
||||||
use tracing::{Level, field::Empty, info, span, trace, warn};
|
use tracing::{Level, field::Empty, span, trace, warn};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
LayoutResult, Layouter,
|
LayoutResult, Layouter,
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ use factorio_core::{
|
||||||
use factorio_pathfinding::belt_finding::{self, conflict_avoidance::ConflictAvoidance};
|
use factorio_pathfinding::belt_finding::{self, conflict_avoidance::ConflictAvoidance};
|
||||||
use rand::{
|
use rand::{
|
||||||
Rng,
|
Rng,
|
||||||
seq::{IndexedRandom, SliceRandom},
|
seq::IndexedRandom,
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{sync::atomic::AtomicU32, time::Instant};
|
use std::{sync::atomic::AtomicU32, time::Instant};
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ use factorio_core::prelude::*;
|
||||||
use factorio_pathfinding::{Connection, examples::HashMapMap};
|
use factorio_pathfinding::{Connection, examples::HashMapMap};
|
||||||
use rand::{
|
use rand::{
|
||||||
Rng,
|
Rng,
|
||||||
seq::{IndexedRandom, SliceRandom},
|
seq::IndexedRandom,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub fn initally_set_blocks(
|
pub fn initally_set_blocks(
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "factorio-pathfinding"
|
name = "factorio-pathfinding"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2024"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,11 @@ use crate::examples::HashMapMap;
|
||||||
use crate::graph::wheighted_graph::shortest_path::a_star;
|
use crate::graph::wheighted_graph::shortest_path::a_star;
|
||||||
use crate::graph::wheighted_graph::WheightedGraph;
|
use crate::graph::wheighted_graph::WheightedGraph;
|
||||||
use crate::misc::Map;
|
use crate::misc::Map;
|
||||||
use crate::priority_queue::binary_heap::BinaryHeap;
|
|
||||||
use crate::priority_queue::binary_heap::FastBinaryHeap;
|
use crate::priority_queue::binary_heap::FastBinaryHeap;
|
||||||
use crate::Connection;
|
use crate::Connection;
|
||||||
use crate::Map as _;
|
use crate::Map as _;
|
||||||
use crate::SinglePathInput;
|
use crate::SinglePathInput;
|
||||||
use crate::{graph::wheighted_graph::shortest_path::dijkstra, SinglePathfinder};
|
use crate::SinglePathfinder;
|
||||||
use factorio_core::{prelude::*, visualize::Visualize};
|
use factorio_core::{prelude::*, visualize::Visualize};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use tracing::span;
|
use tracing::span;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use std::{collections::HashMap, fmt::Debug, hash::Hash, hash::Hasher};
|
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;
|
use crate::priority_queue::PriorityQueue;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
use std::fmt::Debug;
|
|
||||||
pub mod binary_heap;
|
pub mod binary_heap;
|
||||||
pub mod fibonacci_heap;
|
pub mod fibonacci_heap;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue