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

macros: Use a nicer syntax when declaring attributes.

Browse source 
The previous version had a => required|optional|default token, this was
duplicating information for Option types and didn’t look very good.

This new version looks like a type, which can be either Required<_>,
Option<_> or Default<_>, and means the same thing.
This commit is contained in:
Emmanuel Gil Peyrot 2019-02-24 20:26:40 +01:00
commit bcd42a26e3
27 changed files with 162 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/disco.rs
View file

@ -20,7 +20,7 @@ generate_element!(
DiscoInfoQuery, "query", DISCO_INFO,
attributes: [
/// Node on which we are doing the discovery.
node: Option<String> = "node" => optional,
node: Option<String> = "node",
]);
impl IqGetPayload for DiscoInfoQuery {}
@ -31,7 +31,7 @@ generate_element!(
Feature, "feature", DISCO_INFO,
attributes: [
/// Namespace of the feature we want to represent.
var: String = "var" => required,
var: Required<String> = "var",
]);
impl Feature {
@ -206,7 +206,7 @@ generate_element!(
DiscoItemsQuery, "query", DISCO_ITEMS,
attributes: [
/// Node on which we are doing the discovery.
node: Option<String> = "node" => optional,
node: Option<String> = "node",
]);
impl IqGetPayload for DiscoItemsQuery {}
@ -216,11 +216,11 @@ generate_element!(
Item, "item", DISCO_ITEMS,
attributes: [
/// JID of the entity pointed by this item.
jid: Jid = "jid" => required,
jid: Required<Jid> = "jid",
/// Node of the entity pointed by this item.
node: Option<String> = "node" => optional,
node: Option<String> = "node",
/// Name of the entity pointed by this item.
name: Option<String> = "name" => optional,
name: Option<String> = "name",
]);
generate_element!(
@ -232,7 +232,7 @@ generate_element!(
DiscoItemsResult, "query", DISCO_ITEMS,
attributes: [
/// Node on which we have done this discovery.
node: Option<String> = "node" => optional
node: Option<String> = "node"
],
children: [
/// List of items pointed by this entity.