Skip to content

Commit

Permalink
fix types
Browse files Browse the repository at this point in the history
  • Loading branch information
r4v3n6101 committed Jun 17, 2024
1 parent 0d9c0c8 commit 16f3e9b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "goldsrc-rs"
version = "0.10.0"
version = "0.11.1"
authors = ["r4v3n6101 <[email protected]>"]
edition = "2021"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub fn wad_entries<R>(
remap_name_to_lower: bool,
) -> io::Result<HashMap<CStr16, wad::Entry>>
where
R: Read + Seek + Send + Sync + 'static,
R: Read + Seek + Send + 'static,
{
parser::wad::entries(reader, remap_name_to_lower)
}
Expand Down
2 changes: 1 addition & 1 deletion src/parser/wad.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use super::cstr16;

pub fn entries<R>(reader: R, remap_name_to_lower: bool) -> io::Result<HashMap<CStr16, Entry>>
where
R: Read + Seek + Send + Sync + 'static,
R: Read + Seek + Send + 'static,
{
const MAGIC: &[u8; 4] = b"WAD3";

Expand Down
6 changes: 2 additions & 4 deletions src/repr/wad.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T: Read + Seek + Send + Sync> Reader for T {}
pub(crate) trait Reader: Read + Seek + Send {}
impl<T: Read + Seek + Send> Reader for T {}

struct SharedChunkReader {
source: Arc<Mutex<dyn Reader>>,
Expand Down Expand Up @@ -43,7 +42,6 @@ impl Read for SharedChunkReader {
}
}

// TODO : Debug?
pub struct Entry {
pub(crate) source: Arc<Mutex<dyn Reader>>,
pub offset: u32,
Expand Down

0 comments on commit 16f3e9b

Please sign in to comment.