Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from custom macro for grouping cfgs to cfg_if since rustfmt can't see through macros but is hardcoded to parse cfg_if and follow the module names inside it.

Browse Source
This commit is contained in:
Imbris 2023-03-11 07:59:19 -05:00
parent 5f85668b19
commit e8a5de4e65
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -6715,6 +6715,7 @@ version = "0.10.0"
dependencies = [
"approx 0.4.0",
"bitflags",
"cfg-if 1.0.0",
"chrono",
"chrono-tz",
"clap 2.34.0",

1
common/Cargo.toml
View File

@ -27,6 +27,7 @@ serde = { version = "1.0.110", features = ["derive", "rc"] }
# Util
vek = { version = "0.15.8", features = ["serde"] }
cfg-if = "1.0.0"
chrono = "0.4.22"
chrono-tz = "0.6"
itertools = "0.10"

23
common/src/lib.rs
View File

@ -15,20 +15,15 @@
)]
#![feature(hash_drain_filter)]
macro_rules! cfg_not_wasm {
($($item:item)*) => {
$(
#[cfg(not(target_arch = "wasm32"))]
$item
)*
}
}
// Rustfmt can't expand macros to see module declarations inside them but it is
// hardcoded to parse `cfg_if`. https://github.com/rust-lang/rustfmt/issues/3253
use cfg_if::cfg_if;
// Re-exported crates
cfg_not_wasm! {
cfg_if! { if #[cfg(not(target_arch = "wasm32"))] {
pub use common_assets as assets;
pub use uuid;
}
} }
// Modules
@ -39,7 +34,7 @@ pub mod resources;
pub mod uid;
// NOTE: Comment out macro to get rustfmt to re-order these as needed.
cfg_not_wasm! {
cfg_if! { if #[cfg(not(target_arch = "wasm32"))] {
pub mod astar;
pub mod calendar;
pub mod character;
@ -78,7 +73,7 @@ cfg_not_wasm! {
mod cached_spatial_grid;
mod view_distances;
}
} }
// We declare a macro in this module so there are issues referring to it by path
// within this crate if typed module is declared in macro expansion.
@ -86,11 +81,11 @@ cfg_not_wasm! {
pub use combat::{DamageKind, DamageSource};
cfg_not_wasm! {
cfg_if! { if #[cfg(not(target_arch = "wasm32"))] {
pub use cached_spatial_grid::CachedSpatialGrid;
pub use combat::{Damage, GroupTarget, Knockback, KnockbackDir};
pub use comp::inventory::loadout_builder::LoadoutBuilder;
pub use explosion::{Explosion, RadiusEffect};
pub use skillset_builder::SkillSetBuilder;
pub use view_distances::ViewDistances;
}
} }