From 16f3e9bf7cf85867a61d678380ddb79b9f69a69a Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Mon, 17 Jun 2024 23:28:25 +0300 Subject: [PATCH] fix types --- Cargo.toml | 2 +- src/lib.rs | 2 +- src/parser/wad.rs | 2 +- src/repr/wad.rs | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dedb189..f8a8630 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "goldsrc-rs" -version = "0.10.0" +version = "0.11.1" authors = ["r4v3n6101 "] edition = "2021" license = "MIT" diff --git a/src/lib.rs b/src/lib.rs index c97d4f7..e0ac09d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,7 +19,7 @@ pub fn wad_entries( remap_name_to_lower: bool, ) -> io::Result> where - R: Read + Seek + Send + Sync + 'static, + R: Read + Seek + Send + 'static, { parser::wad::entries(reader, remap_name_to_lower) } diff --git a/src/parser/wad.rs b/src/parser/wad.rs index 2163754..2506d57 100644 --- a/src/parser/wad.rs +++ b/src/parser/wad.rs @@ -15,7 +15,7 @@ use super::cstr16; pub fn entries(reader: R, remap_name_to_lower: bool) -> io::Result> where - R: Read + Seek + Send + Sync + 'static, + R: Read + Seek + Send + 'static, { const MAGIC: &[u8; 4] = b"WAD3"; diff --git a/src/repr/wad.rs b/src/repr/wad.rs index a66fb91..a6faff0 100644 --- a/src/repr/wad.rs +++ b/src/repr/wad.rs @@ -13,9 +13,8 @@ pub enum ContentType { Other(u8), } -/// Helpful trait for Read and Seek dyn Trait -pub(crate) trait Reader: Read + Seek + Send + Sync {} -impl Reader for T {} +pub(crate) trait Reader: Read + Seek + Send {} +impl Reader for T {} struct SharedChunkReader { source: Arc>, @@ -43,7 +42,6 @@ impl Read for SharedChunkReader { } } -// TODO : Debug? pub struct Entry { pub(crate) source: Arc>, pub offset: u32,