merge master

This commit is contained in:
ssrlive 2023-08-22 15:24:05 +08:00
commit 8b566b66d7
2 changed files with 152 additions and 122 deletions

View file

@ -9,6 +9,9 @@ pub enum Error {
#[error("std::io::Error {0}")]
Io(#[from] std::io::Error),
#[error("TryFromIntError {0:?}")]
TryFromInt(#[from] std::num::TryFromIntError),
#[error("std::net::AddrParseError {0}")]
AddrParse(#[from] std::net::AddrParseError),