Add Send + Sync mark to Box<dyn Script> (#12)

This commit is contained in:
2026-04-13 14:49:55 +08:00
parent dd2921f2dd
commit 034f4f7a52
74 changed files with 317 additions and 289 deletions

View File

@@ -56,7 +56,7 @@ impl ScriptBuilder for SoftpalPacBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(SoftpalPacArchive::new(
MemReader::new(buf),
archive_encoding,
@@ -72,7 +72,7 @@ impl ScriptBuilder for SoftpalPacBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
let file = std::fs::File::open(filename)?;
let reader = std::io::BufReader::new(file);
Ok(Box::new(SoftpalPacArchive::new(
@@ -85,13 +85,13 @@ impl ScriptBuilder for SoftpalPacBuilder {
fn build_script_from_reader<'a>(
&self,
reader: Box<dyn ReadSeek + 'a>,
reader: Box<dyn ReadSeek + Send + Sync + 'a>,
_filename: &str,
_encoding: Encoding,
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script + 'a>> {
) -> Result<Box<dyn Script + Send + Sync + 'a>> {
Ok(Box::new(SoftpalPacArchive::new(
reader,
archive_encoding,

View File

@@ -28,7 +28,7 @@ impl ScriptBuilder for PgdGeBuilder {
_archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(PgdGe::new(MemReader::new(buf), config)?))
}

View File

@@ -29,7 +29,7 @@ impl ScriptBuilder for Pgd3Builder {
_archive_encoding: Encoding,
config: &ExtraConfig,
archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(Pgd3::new(
MemReader::new(buf),
filename,

View File

@@ -34,7 +34,7 @@ impl ScriptBuilder for SoftpalScriptBuilder {
_archive_encoding: Encoding,
config: &ExtraConfig,
archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(SoftpalScript::new(
buf, filename, encoding, config, archive,
)?))