From 9f68960b287e22dbd124bcc3724334a58feb1892 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 3 Feb 2025 15:29:16 -0800
Subject: [PATCH] fancy pants rust ownership avoids allocation
---
src/source.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/source.rs b/src/source.rs
index 8cab16e..1376cd0 100644
--- a/src/source.rs
+++ b/src/source.rs
@@ -218,7 +218,7 @@ async fn gimme_them_textures(path:PathBuf,vpk_list:&[vpk::VPK],send_texture:toki
let mut mesh_loader=strafesnet_bsp_loader::loader::ModelLoader::new(finder);
// load models and collect requested textures
- for &model_path in mesh_deferred_loader.indices(){
+ for model_path in mesh_deferred_loader.into_indices(){
let model:vmdl::Model=mesh_loader.load(model_path)?;
for texture in model.textures(){
for search_path in &texture.search_paths{
@@ -230,10 +230,10 @@ async fn gimme_them_textures(path:PathBuf,vpk_list:&[vpk::VPK],send_texture:toki
}
}
- for texture_path in texture_deferred_loader.indices(){
- match load_texture(finder,texture_path.as_ref()){
+ for texture_path in texture_deferred_loader.into_indices(){
+ match load_texture(finder,&texture_path){
Ok(Some(texture))=>send_texture.send(
- (texture.into_owned(),texture_path.as_ref().to_owned())
+ (texture.into_owned(),texture_path.into_owned())
).await.unwrap(),
Ok(None)=>(),
Err(e)=>println!("Load error: {e}"),