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

Remove clone() for creating new tweak file

Browse Source
This commit is contained in:
juliancoffee 2021-08-02 16:27:44 +03:00
parent 846233367f
commit 99d0c2cb95
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/assets/src/lib.rs
View File

@ -322,7 +322,7 @@ pub mod asset_tweak {
const EXTENSION: &'static str = "ron"; const EXTENSION: &'static str = "ron";
} }
// helper function to load asset and return value // helper function to load asset and return contained value
// asset_specifier is full "path" to asset relative to ASSETS_PATH. // asset_specifier is full "path" to asset relative to ASSETS_PATH.
fn read_expect<T>(asset_specifier: &str) -> T fn read_expect<T>(asset_specifier: &str) -> T
where where
@ -338,14 +338,13 @@ pub mod asset_tweak {
// returns passed value // returns passed value
fn create_new<T>(tweak_dir: &Path, filename: &str, value: T) -> T fn create_new<T>(tweak_dir: &Path, filename: &str, value: T) -> T
where where
T: Clone + Sized + Send + Sync + 'static + DeserializeOwned + Serialize, T: Sized + Send + Sync + 'static + DeserializeOwned + Serialize,
{ {
fs::create_dir_all(tweak_dir).expect("failed to create directory for tweak files"); fs::create_dir_all(tweak_dir).expect("failed to create directory for tweak files");
let f = fs::File::create(tweak_dir.join(filename)).unwrap_or_else(|error| { let f = fs::File::create(tweak_dir.join(filename)).unwrap_or_else(|error| {
panic!("failed to create file {:?}. Error: {:?}", filename, error) panic!("failed to create file {:?}. Error: {:?}", filename, error)
}); });
// TODO: can we not require clone here? let tweaker = AssetTweakWrapper(&value);
let tweaker = AssetTweakWrapper(value.clone());
if let Err(e) = to_writer_pretty(f, &tweaker, PrettyConfig::new()) { if let Err(e) = to_writer_pretty(f, &tweaker, PrettyConfig::new()) {
panic!("failed to write to file {:?}. Error: {:?}", filename, e); panic!("failed to write to file {:?}. Error: {:?}", filename, e);
} }