Skip to content

Fix UnwindSafe auto impl #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robjtede merged 4 commits into from
Feb 25, 2026
Merged

Fix UnwindSafe auto impl #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29bb9d4
Fix unwind safety auto-trait impl in generic::bufread::Encoder
NobodyXu Feb 25, 2026
7a28b6a
Wrap std::io::Error in AssertUnwindSafe
NobodyXu Feb 25, 2026
7f0c265
Format use statements in decoder.rs
NobodyXu Feb 25, 2026
735ef8b
Format imports in encoder.rs
NobodyXu Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/async-compression/src/generic/bufread/decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ use crate::{
codecs::DecodeV2,
core::util::{PartialBuffer, WriteBuffer},
};
use std::{io::Result, ops::ControlFlow};
use std::{io::Result, ops::ControlFlow, panic::AssertUnwindSafe};

#[derive(Debug)]
enum State {
Decoding,
Flushing,
Done,
Next,
Error(std::io::Error),
Error(AssertUnwindSafe<std::io::Error>),
}

#[derive(Debug)]
Expand Down Expand Up @@ -55,7 +55,7 @@ impl Decoder {
// ignore the first error, occurs when input is empty
// but we need to run decode to flush
Err(err) if !first => {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand All @@ -73,7 +73,7 @@ impl Decoder {
Ok(true) => {
if self.multiple_members {
if let Err(err) = decoder.reinit() {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand All @@ -91,7 +91,7 @@ impl Decoder {
}
Ok(false) => State::Flushing,
Err(err) => {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand Down Expand Up @@ -119,7 +119,7 @@ impl Decoder {
let State::Error(err) = std::mem::replace(&mut self.state, State::Done) else {
unreachable!()
};
return ControlFlow::Break(Err(err));
return ControlFlow::Break(Err(err.0));
}
};

Expand Down
12 changes: 6 additions & 6 deletions crates/async-compression/src/generic/bufread/encoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ use crate::{
codecs::EncodeV2,
core::util::{PartialBuffer, WriteBuffer},
};
use std::{io::Result, ops::ControlFlow};
use std::{io::Result, ops::ControlFlow, panic::AssertUnwindSafe};

#[derive(Debug)]
enum State {
Encoding(usize),
Flushing,
Finishing,
Done,
Error(std::io::Error),
Error(AssertUnwindSafe<std::io::Error>),
}

#[derive(Debug)]
Expand Down Expand Up @@ -54,7 +54,7 @@ impl Encoder {
State::Finishing
} else {
if let Err(err) = encoder.encode(input, output) {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand All @@ -79,7 +79,7 @@ impl Encoder {
}
Ok(false) => State::Flushing,
Err(err) => {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand All @@ -92,7 +92,7 @@ impl Encoder {
Ok(true) => State::Done,
Ok(false) => State::Finishing,
Err(err) => {
self.state = State::Error(err);
self.state = State::Error(AssertUnwindSafe(err));
if output.written_len() > 0 {
return ControlFlow::Break(Ok(()));
} else {
Expand All @@ -107,7 +107,7 @@ impl Encoder {
let State::Error(err) = std::mem::replace(&mut self.state, State::Done) else {
unreachable!()
};
return ControlFlow::Break(Err(err));
return ControlFlow::Break(Err(err.0));
}
};

Expand Down