liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flv: Break `io::Error` into kind and string at construction time to avoid having to do so when cloning.

This commit is contained in:
David Wendt 2023-06-14 23:01:19 -04:00 committed by kmeisthax
parent 0f176484ea
commit ea9c5ae830
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flv/src/error.rs
View File

@ -1,7 +1,7 @@
use std::io::Error as IoError; use std::io::{Error as IoError, ErrorKind as IoErrorKind};
use thiserror::Error; use thiserror::Error;
#[derive(Debug, Error)] #[derive(Debug, Error, Clone)]
pub enum Error { pub enum Error {
#[error("the FLV parser ran out of data")] #[error("the FLV parser ran out of data")]
EndOfData, EndOfData,
@ -51,13 +51,13 @@ pub enum Error {
#[error("the FLV contains a tag with unknown type {0}")] #[error("the FLV contains a tag with unknown type {0}")]
UnknownTagType(u8), UnknownTagType(u8),
#[error("IO error ({0})")] #[error("IO error ({0}, {1})")]
IoError(IoError), IoError(IoErrorKind, String),
} }
impl From<IoError> for Error { impl From<IoError> for Error {
fn from(error: IoError) -> Self { fn from(error: IoError) -> Self {
Self::IoError(error) Self::IoError(error.kind(), error.to_string())
} }
} }
@ -80,36 +80,8 @@ impl PartialEq for Error {
(Self::UnknownVideoCommandType(s), Self::UnknownVideoCommandType(o)) => s == o, (Self::UnknownVideoCommandType(s), Self::UnknownVideoCommandType(o)) => s == o,
(Self::UnknownAvcPacketType(s), Self::UnknownAvcPacketType(o)) => s == o, (Self::UnknownAvcPacketType(s), Self::UnknownAvcPacketType(o)) => s == o,
(Self::UnknownTagType(s), Self::UnknownTagType(o)) => s == o, (Self::UnknownTagType(s), Self::UnknownTagType(o)) => s == o,
(Self::IoError(s), Self::IoError(o)) => s.kind() == o.kind(), (Self::IoError(sk, ss), Self::IoError(ok, os)) => sk == ok && ss == os,
_ => false, _ => false,
} }
} }
} }
impl Clone for Error {
fn clone(&self) -> Self {
match self {
Self::EndOfData => Self::EndOfData,
Self::PointerTooBig => Self::PointerTooBig,
Self::WrongMagic => Self::WrongMagic,
Self::UnknownValueType => Self::UnknownValueType,
Self::ShortAudioBlock => Self::ShortAudioBlock,
Self::UnknownAudioFormatType(unk) => Self::UnknownAudioFormatType(*unk),
Self::UnknownAudioRate(unk) => Self::UnknownAudioRate(*unk),
Self::UnknownAudioSampleSize(unk) => Self::UnknownAudioSampleSize(*unk),
Self::UnknownAudioChannelCount(unk) => Self::UnknownAudioChannelCount(*unk),
Self::UnknownAacPacketType(unk) => Self::UnknownAacPacketType(*unk),
Self::ShortVideoBlock => Self::ShortVideoBlock,
Self::UnknownVideoFrameType(unk) => Self::UnknownVideoFrameType(*unk),
Self::UnknownVideoCodec(unk) => Self::UnknownVideoCodec(*unk),
Self::UnknownVideoCommandType(unk) => Self::UnknownVideoCommandType(*unk),
Self::UnknownAvcPacketType(unk) => Self::UnknownAvcPacketType(*unk),
Self::UnknownTagType(unk) => Self::UnknownTagType(*unk),
// IOError cannot be cloned, since you can attach arbitrary error
// types to it. Instead, cloned FLV errors contain only the error
// kind and text, which can be cloned.
Self::IoError(ioe) => Self::IoError(IoError::new(ioe.kind(), ioe.to_string())),
}
}
}