xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

macros: Remove use requirement on ns.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-14 16:30:28 +02:00
commit 93b018e5ac
41 changed files with 112 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/muc/muc.rs
View file

@ -22,7 +22,7 @@ impl TryFrom<Element> for Muc {
type Err = Error;
fn try_from(elem: Element) -> Result<Muc, Error> {
check_self!(elem, "x", ns::MUC);
check_self!(elem, "x", MUC);
check_no_attributes!(elem, "x");
let mut password = None;

12
src/muc/user.rs
View file

@ -17,7 +17,7 @@ use ns;
generate_attribute_enum!(
/// Lists all of the possible status codes used in MUC presences.
Status, "status", ns::MUC_USER, "code", {
Status, "status", MUC_USER, "code", {
/// Inform user that any occupant is allowed to see the user's full JID
NonAnonymousRoom => 100,
@ -92,7 +92,7 @@ impl TryFrom<Element> for Actor {
type Err = Error;
fn try_from(elem: Element) -> Result<Actor, Error> {
check_self!(elem, "actor", ns::MUC_USER);
check_self!(elem, "actor", MUC_USER);
check_no_unknown_attributes!(elem, "actor", ["jid", "nick"]);
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in actor element."));
@ -121,11 +121,11 @@ impl From<Actor> for Element {
}
}
generate_element_with_only_attributes!(Continue, "continue", ns::MUC_USER, [
generate_element_with_only_attributes!(Continue, "continue", MUC_USER, [
thread: Option<String> = "thread" => optional,
]);
generate_elem_id!(Reason, "reason", ns::MUC_USER);
generate_elem_id!(Reason, "reason", MUC_USER);
generate_attribute!(Affiliation, "affiliation", {
Owner => "owner",
@ -157,7 +157,7 @@ impl TryFrom<Element> for Item {
type Err = Error;
fn try_from(elem: Element) -> Result<Item, Error> {
check_self!(elem, "item", ns::MUC_USER);
check_self!(elem, "item", MUC_USER);
check_no_unknown_attributes!(elem, "item", ["affiliation", "jid", "nick", "role"]);
let mut actor: Option<Actor> = None;
let mut continue_: Option<Continue> = None;
@ -216,7 +216,7 @@ impl TryFrom<Element> for MucUser {
type Err = Error;
fn try_from(elem: Element) -> Result<MucUser, Error> {
check_self!(elem, "x", ns::MUC_USER);
check_self!(elem, "x", MUC_USER);
check_no_attributes!(elem, "x");
let mut status = vec!();
let mut items = vec!();