diff --git a/Cargo.lock b/Cargo.lock index 7f6ccad40a..3cc0878153 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1800,16 +1800,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" dependencies = [ - "enum-iterator-derive 0.7.0", -] - -[[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive 1.2.1", + "enum-iterator-derive", ] [[package]] @@ -1823,17 +1814,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", -] - [[package]] name = "enum-map" version = "2.6.1" @@ -1935,16 +1915,6 @@ dependencies = [ "str-buf", ] -[[package]] -name = "etagere" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" -dependencies = [ - "euclid", - "svg_fmt", -] - [[package]] name = "euc" version = "0.5.3" @@ -4814,16 +4784,6 @@ dependencies = [ "getrandom 0.2.10", ] -[[package]] -name = "rand_distr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -6802,14 +6762,12 @@ dependencies = [ "rustyline", "serde", "specs", - "termcolor", "tokio", "tracing", "vek 0.15.8", "veloren-client-i18n", "veloren-common", "veloren-common-base", - "veloren-common-ecs", "veloren-common-frontend", "veloren-common-net", "veloren-common-state", @@ -6829,7 +6787,6 @@ dependencies = [ "fluent-syntax", "hashbrown 0.13.2", "intl-memoizer", - "ron 0.8.1", "serde", "tracing", "unic-langid", @@ -6843,12 +6800,10 @@ version = "0.10.0" dependencies = [ "approx 0.5.1", "bitflags 2.4.0", - "cfg-if 1.0.0", "chrono", "chrono-tz", "clap", "criterion", - "crossbeam-channel", "crossbeam-utils 0.8.16", "csv", "dot_vox", @@ -6936,7 +6891,6 @@ dependencies = [ "termcolor", "tracing", "tracing-appender", - "tracing-log", "tracing-subscriber", "tracing-tracy", "veloren-common-base", @@ -6988,13 +6942,10 @@ dependencies = [ name = "veloren-common-systems" version = "0.10.0" dependencies = [ - "hashbrown 0.13.2", - "indexmap 1.9.3", "itertools", "ordered-float 3.9.1", "rand 0.8.5", "rayon", - "slab", "specs", "tracing", "vek 0.15.8", @@ -7012,12 +6963,10 @@ dependencies = [ "async-channel", "async-trait", "bincode", - "bitflags 2.4.0", "bytes", "clap", "criterion", "crossbeam-channel", - "futures-core", "futures-util", "hashbrown 0.13.2", "lazy_static", @@ -7058,7 +7007,6 @@ dependencies = [ name = "veloren-plugin-api" version = "0.1.0" dependencies = [ - "bincode", "serde", "veloren-common", ] @@ -7096,7 +7044,6 @@ dependencies = [ "rand_chacha 0.3.1", "rayon", "rmp-serde", - "ron 0.8.1", "serde", "slotmap 1.0.6", "tracing", @@ -7118,7 +7065,6 @@ dependencies = [ "crossbeam-channel", "drop_guard", "enum-map", - "enumset", "futures-util", "hashbrown 0.13.2", "humantime", @@ -7132,7 +7078,6 @@ dependencies = [ "prometheus-hyper", "quinn", "rand 0.8.5", - "rand_distr", "rayon", "refinery", "ron 0.8.1", @@ -7142,7 +7087,6 @@ dependencies = [ "schnellru", "serde", "serde_json", - "slab", "specs", "strum", "tokio", @@ -7169,13 +7113,9 @@ dependencies = [ "lazy_static", "rand 0.8.5", "specs", - "tracing", "vek 0.15.8", "veloren-common", - "veloren-common-base", "veloren-common-dynlib", - "veloren-common-ecs", - "veloren-common-net", "veloren-rtsim", ] @@ -7193,7 +7133,6 @@ dependencies = [ "serde", "shell-words", "signal-hook 0.3.17", - "strum", "tokio", "tracing", "tui", @@ -7212,7 +7151,6 @@ version = "0.15.0" dependencies = [ "assets_manager", "backtrace", - "bincode", "bytemuck", "chrono", "chumsky", @@ -7230,9 +7168,7 @@ dependencies = [ "egui", "egui_wgpu_backend", "egui_winit_platform", - "enum-iterator 1.4.1", "enum-map", - "etagere", "euc", "gilrs", "glyph_brush", @@ -7283,7 +7219,6 @@ dependencies = [ "veloren-world", "wgpu", "wgpu-profiler", - "window_clipboard", "winit", "winres", ] @@ -7332,7 +7267,6 @@ dependencies = [ "criterion", "csv", "deflate", - "enum-iterator 1.4.1", "enum-map", "fallible-iterator", "flate2", @@ -7612,7 +7546,7 @@ checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88" dependencies = [ "backtrace", "cfg-if 1.0.0", - "enum-iterator 0.7.0", + "enum-iterator", "enumset", "lazy_static", "leb128", @@ -7665,7 +7599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b" dependencies = [ "bytecheck", - "enum-iterator 0.7.0", + "enum-iterator", "enumset", "indexmap 1.9.3", "more-asserts", @@ -7686,7 +7620,7 @@ dependencies = [ "corosensei", "dashmap", "derivative", - "enum-iterator 0.7.0", + "enum-iterator", "fnv", "indexmap 1.9.3", "lazy_static", diff --git a/client/Cargo.toml b/client/Cargo.toml index 92a73248b9..f459225045 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [features] simd = ["vek/platform_intrinsics"] plugins = ["common-state/plugins"] -bin_bot = ["common-ecs", "serde", "ron", "clap", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "client-i18n"] +bin_bot = ["serde", "ron", "clap", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "client-i18n"] tracy = ["common-base/tracy"] tick_network = [] @@ -36,7 +36,6 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e117 #TODO: put bot in a different crate #bot only async-channel = { version = "1.6", optional = true } -common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true } voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true } client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true } serde = { workspace = true, features = [ "rc" ], optional = true } @@ -44,7 +43,6 @@ ron = { workspace = true, optional = true } clap = { workspace = true, optional = true } rustyline = { version = "12.0.0", optional = true } ## logging -termcolor = { version = "1.1", optional = true } common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true } [dev-dependencies] diff --git a/client/i18n/Cargo.toml b/client/i18n/Cargo.toml index 034b3b001b..be93a45c1c 100644 --- a/client/i18n/Cargo.toml +++ b/client/i18n/Cargo.toml @@ -9,7 +9,6 @@ version = "0.13.0" # Assets common = {package = "veloren-common", path = "../../common"} common-assets = {package = "veloren-common-assets", path = "../../common/assets"} -ron = { workspace = true } serde = { workspace = true } # Localization unic-langid = { version = "0.9"} diff --git a/common/Cargo.toml b/common/Cargo.toml index 1bd0ce2c0f..8bd0f8f5ea 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -28,7 +28,6 @@ serde = { workspace = true, features = ["rc"] } # Util enum-map = "2.4" vek = { workspace = true } -cfg-if = "1.0.0" chrono = { workspace = true } chrono-tz = { workspace = true } itertools = { workspace = true } @@ -40,7 +39,6 @@ strum = { workspace = true } approx = "0.5.1" crossbeam-utils = { workspace = true } -crossbeam-channel = { workspace = true } bitflags = { workspace = true, features = ["serde"] } lazy_static = { workspace = true } num-derive = "0.4.0" diff --git a/common/frontend/Cargo.toml b/common/frontend/Cargo.toml index 4f1fe6b3a5..10e836271a 100644 --- a/common/frontend/Cargo.toml +++ b/common/frontend/Cargo.toml @@ -15,7 +15,6 @@ common-base = { package = "veloren-common-base", path = "../base" } termcolor = "1.1" tracing = { workspace = true } tracing-appender = "0.2.0" -tracing-log = "0.1.1" tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec", "tracing-log"]} # Tracy diff --git a/common/systems/Cargo.toml b/common/systems/Cargo.toml index 8b0d6c1852..993dc34cff 100644 --- a/common/systems/Cargo.toml +++ b/common/systems/Cargo.toml @@ -22,11 +22,6 @@ vek = { workspace = true } ordered-float = { workspace = true } itertools = { workspace = true } -# Data structures -hashbrown = { workspace = true } -indexmap = "1.3.0" -slab = { workspace = true } - # ECS specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] } diff --git a/network/Cargo.toml b/network/Cargo.toml index 17a602363a..0fd16d0228 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -30,7 +30,6 @@ tokio-stream = { version = "0.1.2", default-features = false } tracing = { workspace = true } prometheus = { workspace = true, optional = true } #async -futures-core = { version = "0.3", default-features = false } futures-util = { workspace = true, features = ["std"] } async-channel = "1.6" #use for .close() channels #mpsc channel registry @@ -39,8 +38,6 @@ rand = { workspace = true } #quic support quinn = { version = "0.10", optional = true } rustls = "0.21" -#stream flags -bitflags = { workspace = true } lz-fear = { version = "0.1.1", optional = true } # async traits async-trait = "0.1.42" diff --git a/plugin/api/Cargo.toml b/plugin/api/Cargo.toml index f5285a8e6d..8a72ecb897 100644 --- a/plugin/api/Cargo.toml +++ b/plugin/api/Cargo.toml @@ -7,4 +7,3 @@ edition = "2021" [dependencies] serde = { workspace = true } common = { package = "veloren-common", path = "../../common", features = ["no-assets"] } -bincode = { workspace = true } diff --git a/rtsim/Cargo.toml b/rtsim/Cargo.toml index 3784c8f356..484e5677d2 100644 --- a/rtsim/Cargo.toml +++ b/rtsim/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] common = { package = "veloren-common", path = "../common" } world = { package = "veloren-world", path = "../world" } -ron = { workspace = true } serde = { workspace = true } hashbrown = { workspace = true } enum-map = { workspace = true, features = ["serde"] } diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index 41b9dd5825..5485670b61 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -46,7 +46,6 @@ shell-words = "1.0.0" tracing = { workspace = true } ron = { workspace = true } serde = { workspace = true, features = [ "rc", "derive" ]} -strum = { workspace = true } [target.'cfg(windows)'.dependencies] mimalloc = "0.1.29" diff --git a/server/Cargo.toml b/server/Cargo.toml index c9c0607656..0d673d61c7 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -61,9 +61,6 @@ crossbeam-channel = { workspace = true } prometheus = { workspace = true } portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" } authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e11706d7bb97fb7a459e1e6533" } # xMAC94x/current_master_till_refactored branch -slab = "0.4" -rand_distr = "0.4.0" -enumset = "1.0.8" enum-map = { workspace = true } noise = { version = "0.7", default-features = false } censor = "0.3" diff --git a/server/agent/Cargo.toml b/server/agent/Cargo.toml index d97ce12c3f..71e691d709 100644 --- a/server/agent/Cargo.toml +++ b/server/agent/Cargo.toml @@ -10,15 +10,11 @@ be-dyn-lib = [] [dependencies] common = { package = "veloren-common", path = "../../common"} -common-base = { package = "veloren-common-base", path = "../../common/base" } -common-net = { package = "veloren-common-net", path = "../../common/net" } -common-ecs = { package = "veloren-common-ecs", path = "../../common/ecs" } common-dynlib = { package = "veloren-common-dynlib", path = "../../common/dynlib", optional = true} rtsim = { package = "veloren-rtsim", path = "../../rtsim" } specs = { workspace = true, features = ["shred-derive"] } vek = { workspace = true } rand = { workspace = true, features = ["small_rng"] } -tracing = { workspace = true } itertools = { workspace = true } lazy_static = { workspace = true } diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index e5f670f2bb..3425feca58 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -73,7 +73,6 @@ conrod_winit = {git = "https://gitlab.com/veloren/conrod.git", branch="copypasta euc = "0.5.0" iced = {package = "iced_native", git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"} iced_winit = {git = "https://github.com/Imberflur/iced", tag = "veloren-winit-0.28"} -window_clipboard = "0.3" glyph_brush = "0.7.0" # https://gitlab.com/Frinksy/keyboard-keynames/-/merge_requests/8 keyboard-keynames = { git = "https://gitlab.com/Imbris/keyboard-keynames.git", tag = "veloren-winit-0.28" } @@ -101,16 +100,13 @@ clap = { workspace = true } # Utility assets_manager = {version = "0.10", features = ["ab_glyph"]} backtrace = "0.3.40" -bincode = { workspace = true } chrono = { workspace = true } chumsky = "0.9" crossbeam-utils = { workspace = true } crossbeam-channel = { workspace = true } directories-next = "2.0" dot_vox = "5.1" -enum-iterator = "1.1.0" guillotiere = "0.6.2" -etagere = "0.2.7" hashbrown = { workspace = true } image = { workspace = true, features = ["ico"]} lazy_static = { workspace = true } diff --git a/world/Cargo.toml b/world/Cargo.toml index 6ced989ad6..d4abaec173 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -20,7 +20,6 @@ common-dynlib = {package = "veloren-common-dynlib", path = "../common/dynlib", o bincode = { workspace = true } bitvec = "1.0.1" -enum-iterator = "1.1.3" enum-map = { workspace = true } fxhash = { workspace = true } image = { workspace = true }