From b74325291675d54d9c94a9560d3de3d070c54727 Mon Sep 17 00:00:00 2001 From: JustTestingV Date: Sat, 20 Jan 2024 20:27:52 +0300 Subject: [PATCH] deleted lavina-core dependency in proto-xmpp --- Cargo.lock | 1 - crates/proto-xmpp/Cargo.toml | 1 - crates/proto-xmpp/src/stream.rs | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c46c42f..c0ed647 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1376,7 +1376,6 @@ dependencies = [ "anyhow", "assert_matches", "derive_more", - "lavina-core", "lazy_static", "quick-xml", "regex", diff --git a/crates/proto-xmpp/Cargo.toml b/crates/proto-xmpp/Cargo.toml index ec43715..01fec80 100644 --- a/crates/proto-xmpp/Cargo.toml +++ b/crates/proto-xmpp/Cargo.toml @@ -4,7 +4,6 @@ edition = "2021" version.workspace = true [dependencies] -lavina-core.workspace = true quick-xml.workspace = true lazy_static.workspace = true regex.workspace = true diff --git a/crates/proto-xmpp/src/stream.rs b/crates/proto-xmpp/src/stream.rs index 40f5f5b..b336bc8 100644 --- a/crates/proto-xmpp/src/stream.rs +++ b/crates/proto-xmpp/src/stream.rs @@ -3,7 +3,6 @@ use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event}; use quick_xml::name::{Namespace, QName, ResolveResult}; use quick_xml::{NsReader, Writer}; use tokio::io::{AsyncBufRead, AsyncWrite}; -use lavina_core::prelude::fail; use super::skip_text; @@ -29,10 +28,10 @@ impl ClientStreamStart { if let Event::Start(e) = incoming { let (ns, local) = reader.resolve_element(e.name()); if ns != ResolveResult::Bound(Namespace(XMLNS.as_bytes())) { - return Err(fail("Invalid namespace for stream element")); + return Err(anyhow!("Invalid namespace for stream element")); } if local.into_inner() != b"stream" { - return Err(fail("Invalid local name for stream element")); + return Err(anyhow!("Invalid local name for stream element")); } let mut to = None; let mut lang = None; @@ -65,7 +64,7 @@ impl ClientStreamStart { version: version.unwrap(), }) } else { - Err(fail("Incoming message does not belong XML Start Event")) + Err(anyhow!("Incoming message does not belong XML Start Event")) } } }