diff options
Diffstat (limited to 'filamento/src/error.rs')
| -rw-r--r-- | filamento/src/error.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/filamento/src/error.rs b/filamento/src/error.rs index af3320f..721d532 100644 --- a/filamento/src/error.rs +++ b/filamento/src/error.rs @@ -3,6 +3,7 @@ use std::{num::TryFromIntError, string::FromUtf8Error, sync::Arc}; use base64::DecodeError; use image::ImageError; use jid::JID; +use jid::JIDError; use lampada::error::{ActorError, ReadError, WriteError}; use stanza::client::{Stanza, iq::Query}; use thiserror::Error; @@ -297,7 +298,7 @@ pub enum DatabaseOpenError { // #[error("migration: {0}")] // Migration(Arc<rusqlite::migrate::MigrateError>), #[error("io: {0}")] - Io(Arc<tokio::io::Error>), + Io(Arc<std::io::Error>), #[error("invalid path")] InvalidPath, #[error("tokio oneshot recv error: {0}")] @@ -310,8 +311,8 @@ pub enum DatabaseOpenError { // } // } -impl From<tokio::io::Error> for DatabaseOpenError { - fn from(e: tokio::io::Error) -> Self { +impl From<std::io::Error> for DatabaseOpenError { + fn from(e: std::io::Error) -> Self { Self::Io(Arc::new(e)) } } @@ -332,6 +333,8 @@ pub enum PresenceError { MissingFrom, #[error("stanza error: {0:?}")] StanzaError(Option<stanza::client::error::Error>), + #[error("received subscription request from a non-bare jid")] + InvalidSubscriptionRequest(#[from] JIDError), } #[derive(Debug, Error, Clone)] |