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

Get rid of IntoElements, replace it with Into<Node> and <T: Into<Node> IntoIterator<Item = T>. This is a backwards-incompatible change, but should require minimal changes.

Browse source 
Doing this splits the `append` method in `ElementBuilder` into two methods. `append` now appends exactly one node, while `append_all` appends an iterator of nodes.

Add `remove_child`, which removes the first child that has a specific name and namespace, then returns it if it exists.

Add a lot of convenience methods on `Node`: `as_text_mut`, `as_element_mut`, `into_text`, `into_element`.
This commit is contained in:
lumi 2018-12-23 15:40:23 +01:00
commit c5c8dee20a
3 changed files with 162 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/convert.rs
View file

@ -2,85 +2,6 @@
use element::{Element, ElementBuilder};
/// A struct which is used for emitting `Element`s and text nodes into an `Element` without
/// exposing more functionality than necessary.
pub struct ElementEmitter<'a>(&'a mut Element);
impl<'a> ElementEmitter<'a> {
/// Creates a new `ElementEmitter`.
pub fn new(root: &'a mut Element) -> ElementEmitter<'a> {
ElementEmitter(root)
}
/// Appends an `Element` to the target.
pub fn append_child(&mut self, element: Element) {
self.0.append_child(element);
}
/// Appends a text node to the target.
pub fn append_text_node(&mut self, text: String) {
self.0.append_text_node(text);
}
}
/// A trait for types which can be converted to one or multiple `Element`s.
pub trait IntoElements {
/// Emits this as a sequence of text nodes and `Element`s.
fn into_elements(self, emitter: &mut ElementEmitter);
}
impl<T: IntoElements> IntoElements for Vec<T> {
fn into_elements(self, emitter: &mut ElementEmitter) {
for elem in self {
elem.into_elements(emitter);
}
}
}
impl<'a, T: IntoElements + Clone> IntoElements for &'a [T] {
fn into_elements(self, emitter: &mut ElementEmitter) {
self.to_vec().into_elements(emitter);
}
}
impl<T: IntoElements> IntoElements for Option<T> {
fn into_elements(self, emitter: &mut ElementEmitter) {
if let Some(e) = self {
e.into_elements(emitter);
}
}
}
impl<T> IntoElements for T where T: Into<Element> {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_child(self.into());
}
}
impl IntoElements for ElementBuilder {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_child(self.build());
}
}
impl IntoElements for String {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_text_node(self);
}
}
impl<'a> IntoElements for &'a String {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_text_node(self.to_owned());
}
}
impl<'a> IntoElements for &'a str {
fn into_elements(self, emitter: &mut ElementEmitter) {
emitter.append_text_node(self.to_owned());
}
}
/// A trait for types which can be converted to an attribute value.
pub trait IntoAttributeValue {
/// Turns this into an attribute string, or None if it shouldn't be added.