From 007397c644d65460f5b911222a0957c7702c0fa0 Mon Sep 17 00:00:00 2001 From: coffee-compiler <22056268-coffee-compiler@users.noreply.gitlab.com> Date: Tue, 23 Jul 2024 11:59:15 +0000 Subject: [PATCH] Remove single file binary folders --- client/Cargo.toml | 2 +- client/examples/{chat-cli/main.rs => chat_cli.rs} | 0 client/i18n/Cargo.toml | 4 ++-- client/i18n/src/bin/{i18n-check.rs => i18n_check.rs} | 0 client/i18n/src/bin/{i18n-csv.rs => i18n_csv.rs} | 0 client/src/bin/{swarm/main.rs => swarm.rs} | 0 common/src/bin/{csv_export/main.rs => csv_export.rs} | 0 common/src/bin/{csv_import/main.rs => csv_import.rs} | 0 network/Cargo.toml | 2 +- .../examples/{network-speed/main.rs => network_speed.rs} | 0 voxygen/Cargo.toml | 6 +++--- voxygen/src/bin/{img-export.rs => img_export.rs} | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename client/examples/{chat-cli/main.rs => chat_cli.rs} (100%) rename client/i18n/src/bin/{i18n-check.rs => i18n_check.rs} (100%) rename client/i18n/src/bin/{i18n-csv.rs => i18n_csv.rs} (100%) rename client/src/bin/{swarm/main.rs => swarm.rs} (100%) rename common/src/bin/{csv_export/main.rs => csv_export.rs} (100%) rename common/src/bin/{csv_import/main.rs => csv_import.rs} (100%) rename network/examples/{network-speed/main.rs => network_speed.rs} (100%) rename voxygen/src/bin/{img-export.rs => img_export.rs} (100%) diff --git a/client/Cargo.toml b/client/Cargo.toml index d6641a4250..c7903c8187 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -73,7 +73,7 @@ voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../vo client-i18n = { package = "veloren-client-i18n", path = "i18n" } [[example]] -name = "chat-cli" +name = "chat_cli" required-features = ["bin_bot"] [[bin]] diff --git a/client/examples/chat-cli/main.rs b/client/examples/chat_cli.rs similarity index 100% rename from client/examples/chat-cli/main.rs rename to client/examples/chat_cli.rs diff --git a/client/i18n/Cargo.toml b/client/i18n/Cargo.toml index 4584e09f48..d3223a29bb 100644 --- a/client/i18n/Cargo.toml +++ b/client/i18n/Cargo.toml @@ -24,11 +24,11 @@ clap = { workspace = true, optional = true } fluent-syntax = { git = "https://github.com/juliancoffee/fluent-rs.git", branch = "patched"} [[bin]] -name = "i18n-check" +name = "i18n_check" required-features = ["bin"] [[bin]] -name = "i18n-csv" +name = "i18n_csv" required-features = ["stat"] [features] diff --git a/client/i18n/src/bin/i18n-check.rs b/client/i18n/src/bin/i18n_check.rs similarity index 100% rename from client/i18n/src/bin/i18n-check.rs rename to client/i18n/src/bin/i18n_check.rs diff --git a/client/i18n/src/bin/i18n-csv.rs b/client/i18n/src/bin/i18n_csv.rs similarity index 100% rename from client/i18n/src/bin/i18n-csv.rs rename to client/i18n/src/bin/i18n_csv.rs diff --git a/client/src/bin/swarm/main.rs b/client/src/bin/swarm.rs similarity index 100% rename from client/src/bin/swarm/main.rs rename to client/src/bin/swarm.rs diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export.rs similarity index 100% rename from common/src/bin/csv_export/main.rs rename to common/src/bin/csv_export.rs diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import.rs similarity index 100% rename from common/src/bin/csv_import/main.rs rename to common/src/bin/csv_import.rs diff --git a/network/Cargo.toml b/network/Cargo.toml index 14806db1fa..6659cd8686 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -82,7 +82,7 @@ harness = false name = "fileshare" [[example]] -name = "network-speed" +name = "network_speed" [[example]] name = "chat" diff --git a/network/examples/network-speed/main.rs b/network/examples/network_speed.rs similarity index 100% rename from network/examples/network-speed/main.rs rename to network/examples/network_speed.rs diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 21185a0078..a8653d6371 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -34,7 +34,7 @@ plugins = ["client/plugins", "common-assets/plugins", "server/plugins"] egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"] shaderc-from-source = ["shaderc/build-from-source"] discord = ["discord-sdk"] -bin_img-export = ["common-assets"] +bin_img_export = ["common-assets"] # We don't ship egui with published release builds so a separate feature is required that excludes it. default-publish = [ @@ -172,5 +172,5 @@ harness = false name = "meshing_benchmark" [[bin]] -name = "img-export" -required-features = ["bin_img-export"] +name = "img_export" +required-features = ["bin_img_export"] diff --git a/voxygen/src/bin/img-export.rs b/voxygen/src/bin/img_export.rs similarity index 100% rename from voxygen/src/bin/img-export.rs rename to voxygen/src/bin/img_export.rs