robin/vbspview
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbspview.git synced 2026-06-03 18:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2023-12-11 21:48:54 +01:00
commit 9c7264d4be
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/material.rs
View file

@ -38,7 +38,7 @@ pub fn load_material(
.map(|dir| { .map(|dir| {
format!( format!(
"materials/{}", "materials/{}",
dir.to_ascii_lowercase().trim_start_matches("/") dir.to_ascii_lowercase().trim_start_matches('/')
) )
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -69,8 +69,8 @@ pub fn load_material(
let table = vmt let table = vmt
.values() .values()
.cloned()
.next() .next()
.cloned()
.ok_or(Error::Other("empty vmt"))?; .ok_or(Error::Other("empty vmt"))?;
let base_texture = table let base_texture = table
.lookup("$basetexture") .lookup("$basetexture")
@ -98,7 +98,7 @@ fn parse_vdf(bytes: &[u8]) -> Result<Table, Error> {
let mut reader = steamy_vdf::Reader::from(bytes); let mut reader = steamy_vdf::Reader::from(bytes);
Table::load(&mut reader).map_err(|e| { Table::load(&mut reader).map_err(|e| {
error!( error!(
source = String::from_utf8_lossy(&bytes).to_string(), source = String::from_utf8_lossy(bytes).to_string(),
"failed to parse vmt" "failed to parse vmt"
); );
e.into() e.into()
@ -108,7 +108,7 @@ fn parse_vdf(bytes: &[u8]) -> Result<Table, Error> {
fn load_texture(name: &str, loader: &Loader, translucent: bool) -> Result<CpuTexture, Error> { fn load_texture(name: &str, loader: &Loader, translucent: bool) -> Result<CpuTexture, Error> {
let path = format!( let path = format!(
"materials/{}.vtf", "materials/{}.vtf",
name.trim_end_matches(".vtf").trim_start_matches("/") name.trim_end_matches(".vtf").trim_start_matches('/')
); );
let mut raw = loader.load(&path)?; let mut raw = loader.load(&path)?;
let vtf = VTF::read(&mut raw)?; let vtf = VTF::read(&mut raw)?;