cleanup

stanza/src/bind.rs

@@ -13,8 +13,8 @@ pub struct Bind {
 
 impl FromElement for Bind {
     fn from_element(mut element: peanuts::Element) -> peanuts::element::DeserializeResult<Self> {
-        element.check_name("bind");
+        element.check_name("bind")?;
-        element.check_name(XMLNS);
+        element.check_name(XMLNS)?;
 
         let r#type = element.pop_child_opt()?;
 
@@ -61,8 +61,8 @@ pub struct FullJidType(pub JID);
 
 impl FromElement for FullJidType {
     fn from_element(mut element: peanuts::Element) -> peanuts::element::DeserializeResult<Self> {
-        element.check_name("jid");
+        element.check_name("jid")?;
-        element.check_namespace(XMLNS);
+        element.check_namespace(XMLNS)?;
 
         let jid = element.pop_value()?;
 

stanza/src/client/mod.rs

@@ -1,7 +1,7 @@
 use iq::Iq;
 use message::Message;
 use peanuts::{
-    element::{Content, ContentBuilder, FromContent, FromElement, IntoContent, IntoElement},
+    element::{Content, ContentBuilder, FromContent, FromElement, IntoContent},
     DeserializeError,
 };
 use presence::Presence;

stanza/src/starttls.rs

@@ -1,7 +1,5 @@
-use std::collections::{HashMap, HashSet};
-
 use peanuts::{
-    element::{Content, FromElement, IntoElement, Name, NamespaceDeclaration},
+    element::{FromElement, IntoElement},
     Element,
 };
 

stanza/src/stream.rs

@@ -1,15 +1,13 @@
-use std::collections::{HashMap, HashSet};
-
 use jid::JID;
-use peanuts::element::{Content, ElementBuilder, FromElement, IntoElement, NamespaceDeclaration};
+use peanuts::element::{ElementBuilder, FromElement, IntoElement};
-use peanuts::{element::Name, Element};
+use peanuts::Element;
 
 use crate::bind;
 
+use super::client;
 use super::sasl::{self, Mechanisms};
 use super::starttls::{self, StartTls};
 use super::stream_error::{Error as StreamError, Text};
-use super::{client, stream_error};
 
 pub const XMLNS: &str = "http://etherx.jabber.org/streams";