Post rebase fix
This commit is contained in:
parent
c11ce3d21c
commit
40e0885a78
17
Cargo.toml
17
Cargo.toml
|
|
@ -40,8 +40,8 @@ make = {path = "./crates/make"}
|
|||
fast_class = {path = "./crates/fast_class"}
|
||||
formatter = {path = "./crates/formatter"}
|
||||
weaponry = {path = "./crates/weaponry"}
|
||||
more_fields = {path = "./crates/more_fields"}
|
||||
|
||||
<<<<<<< HEAD
|
||||
anyhow = "1.0.103"
|
||||
toml = "1.1.2"
|
||||
clap = { version = "4.6.1", features = ["derive"] }
|
||||
|
|
@ -53,20 +53,5 @@ csv = "1.4.0"
|
|||
ron = "0.12.2"
|
||||
glob = "0.3.3"
|
||||
tokio = { version = "1.52.3", features = ["full"] }
|
||||
=======
|
||||
anyhow = "1.0.100"
|
||||
toml = "0.9.11"
|
||||
clap = { version = "4.5.54", features = ["derive"] }
|
||||
regex = "1.12.2"
|
||||
regex_static = "0.1.1"
|
||||
serde = { version = "1.0.228", features = ["derive", "alloc"] }
|
||||
csv = "1.4.0"
|
||||
ron = "0.12.0"
|
||||
glob = "0.3.3"
|
||||
tokio = "1.49.0"
|
||||
>>>>>>> 6becdfb (Updates dependencies)
|
||||
dynfmt = { version = "0.1.5", features = ["curly"] }
|
||||
<<<<<<< HEAD
|
||||
pretty_assertions = "^1.4"
|
||||
=======
|
||||
>>>>>>> 6a1e9d3 (Removed nearly all phf references)
|
||||
|
|
|
|||
|
|
@ -6,3 +6,4 @@ edition = "2024"
|
|||
[dependencies]
|
||||
clap = {workspace = true}
|
||||
serde = {workspace = true}
|
||||
phf = {workspace = true}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ pub enum GraphTargetType {
|
|||
/// Initialize the connfig
|
||||
Init,
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
impl From<&str> for GraphTargetType {
|
||||
fn from(value: &str) -> Self {
|
||||
if let Some(target) = STR_TO_GRAPH_TARGET_TYPE.get(&value.to_lowercase()).cloned() {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,4 @@ edition = "2024"
|
|||
config = {workspace = true}
|
||||
cli_parser = {workspace = true}
|
||||
anyhow = {workspace = true}
|
||||
<<<<<<< HEAD
|
||||
facet = "0.46.5"
|
||||
=======
|
||||
facet = "0.43.1"
|
||||
>>>>>>> 6becdfb (Updates dependencies)
|
||||
|
|
|
|||
|
|
@ -7,12 +7,9 @@ edition = "2024"
|
|||
config = {workspace = true}
|
||||
cli_parser = {workspace = true}
|
||||
anyhow = {workspace = true}
|
||||
<<<<<<< HEAD
|
||||
charts-rs = { version = "0.7", features = ["image-encoder"] }
|
||||
=======
|
||||
charts-rs = "0.3.27"
|
||||
>>>>>>> 6becdfb (Updates dependencies)
|
||||
serde = {workspace = true}
|
||||
csv = {workspace = true}
|
||||
ron = {workspace = true}
|
||||
glob = {workspace = true}
|
||||
phf = {workspace = true}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,7 @@ toml = {workspace = true}
|
|||
tokio = {workspace = true}
|
||||
dynfmt = {workspace = true}
|
||||
|
||||
<<<<<<< HEAD
|
||||
indicatif = { version = "0.18.6", features = ["rayon"] }
|
||||
logos = "0.16.1"
|
||||
indexmap = "2.14.0"
|
||||
console = "0.16.4"
|
||||
=======
|
||||
indicatif = { version = "0.18.3", features = ["rayon"] }
|
||||
logos = "0.16.0"
|
||||
indexmap = "2.13.0"
|
||||
console = "0.16.2"
|
||||
>>>>>>> 6becdfb (Updates dependencies)
|
||||
|
|
|
|||
|
|
@ -14,13 +14,9 @@ fast_class = {workspace = true}
|
|||
anyhow = {workspace = true}
|
||||
toml = {workspace = true}
|
||||
clap = {workspace = true}
|
||||
<<<<<<< HEAD
|
||||
tokio = {workspace = true}
|
||||
formatter = {workspace = true}
|
||||
weaponry = {workspace = true}
|
||||
=======
|
||||
tokio = { version = "1.49.0", features = ["full"] }
|
||||
>>>>>>> 6becdfb (Updates dependencies)
|
||||
|
||||
[package.metadata.cargo-machete]
|
||||
ignored = ["tokio"]
|
||||
|
|
|
|||
Loading…
Reference in New Issue