lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-14 00:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lifegpc
2026-04-13 14:49:55 +08:00
parent dd2921f2dd
commit 034f4f7a52
74 changed files with 317 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/bgi/archive/dsc.rs
View File

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

8
src/scripts/bgi/archive/v1.rs
View File

@@ -40,7 +40,7 @@ impl ScriptBuilder for BgiArchiveBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(BgiArchive::new(
MemReader::new(data),
archive_encoding,
@@ -56,7 +56,7 @@ impl ScriptBuilder for BgiArchiveBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
if filename == "-" {
let data = crate::utils::files::read_file(filename)?;
Ok(Box::new(BgiArchive::new(
@@ -79,13 +79,13 @@ impl ScriptBuilder for BgiArchiveBuilder {
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(BgiArchive::new(
reader,
archive_encoding,

8
src/scripts/bgi/archive/v2.rs
View File

@@ -40,7 +40,7 @@ impl ScriptBuilder for BgiArchiveBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(BgiArchive::new(
MemReader::new(data),
archive_encoding,
@@ -56,7 +56,7 @@ impl ScriptBuilder for BgiArchiveBuilder {
archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
if filename == "-" {
let data = crate::utils::files::read_file(filename)?;
Ok(Box::new(BgiArchive::new(
@@ -79,13 +79,13 @@ impl ScriptBuilder for BgiArchiveBuilder {
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(BgiArchive::new(
reader,
archive_encoding,

8
src/scripts/bgi/audio/audio.rs
View File

@@ -29,7 +29,7 @@ impl ScriptBuilder for BgiAudioBuilder {
_archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(BgiAudio::new(MemReader::new(buf), config)?))
}
@@ -40,7 +40,7 @@ impl ScriptBuilder for BgiAudioBuilder {
_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 f = std::io::BufReader::new(file);
Ok(Box::new(BgiAudio::new(f, config)?))
@@ -48,13 +48,13 @@ impl ScriptBuilder for BgiAudioBuilder {
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(BgiAudio::new(reader, config)?))
}

2
src/scripts/bgi/bp.rs
View File

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

2
src/scripts/bgi/bsi.rs
View File

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

2
src/scripts/bgi/image/cbg.rs
View File

@@ -37,7 +37,7 @@ impl ScriptBuilder for BgiCBGBuilder {
_archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(BgiCBG::new(data, config)?))
}

2
src/scripts/bgi/image/img.rs
View File

@@ -55,7 +55,7 @@ impl ScriptBuilder for BgiImageBuilder {
_archive_encoding: Encoding,
config: &ExtraConfig,
_archive: Option<&Box<dyn Script>>,
) -> Result<Box<dyn Script>> {
) -> Result<Box<dyn Script + Send + Sync>> {
Ok(Box::new(BgiImage::new(data, config)?))
}

2
src/scripts/bgi/script.rs
View File

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