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

Use hashable wrapper around gen opts

Browse Source
This commit is contained in:
juliancoffee 2022-07-15 18:28:35 +03:00
parent ddf2c43c18
commit 6faba8a1e9
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
world/src/sim/mod.rs
View File

@ -384,9 +384,25 @@ impl FileOpts {
hash::{Hash, Hasher},
};
// We convert opts to string, as opts isn't hasheable because
// of scale which is f64
let opts = format!("{opts:?}");
// Hashable wrapper around gen opts
#[derive(Hash)]
struct GenOptsWrapper {
x_lg: u32,
y_lg: u32,
scale: ordered_float::OrderedFloat<f64>,
}
// NOTE: we use pattern-matching to get opts fields
// so that when main opts strut gains new fields,
// compiler will bonk you into updating wrapper struct
let SizeOpts { x_lg, y_lg, scale } = opts;
let opts = GenOptsWrapper {
x_lg: *x_lg,
y_lg: *y_lg,
scale: ordered_float::OrderedFloat(*scale),
};
let mut hashed_opts = DefaultHasher::new();
opts.hash(&mut hashed_opts);