Skip to content

Use Vec to implement the Events iterators #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2020
Merged

Use Vec to implement the Events iterators #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions typed-html/src/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
use crate::OutputType;
use htmlescape::encode_attribute;
use std::fmt::{Display, Error, Formatter};
use std::iter;

/// Trait for event handlers.
pub trait EventHandler<T: OutputType + Send, E: Send> {
Expand Down Expand Up @@ -34,41 +33,38 @@ macro_rules! declare_events_struct {

impl<T: Send> Events<T> {
pub fn iter(&self) -> impl Iterator<Item = (&'static str, &T)> {
iter::empty()
let mut vec = Vec::new();
$(
.chain(
self.$name.iter()
.map(|value| (stringify!($name), value))
)
if let Some(ref value) = self.$name {
vec.push((stringify!($name), value));
}
)*
vec.into_iter()
}

pub fn iter_mut(&mut self) -> impl Iterator<Item = (&'static str, &mut T)> {
iter::empty()
let mut vec = Vec::new();
$(
.chain(
self.$name.iter_mut()
.map(|value| (stringify!($name), value))
)
if let Some(ref mut value) = self.$name {
vec.push((stringify!($name), value));
}
)*
vec.into_iter()
}
}

impl<T: 'static + Send> IntoIterator for Events<T> {
type Item = (&'static str, T);
type IntoIter = Box<dyn Iterator<Item = Self::Item>>;

fn into_iter(mut self) -> Self::IntoIter {
Box::new(
iter::empty()
$(
.chain(
iter::once(self.$name.take())
.filter(Option::is_some)
.map(|value| (stringify!($name), value.unwrap()))
)
)*
)
fn into_iter(self) -> Self::IntoIter {
let mut vec = Vec::new();
$(
if let Some(value) = self.$name {
vec.push((stringify!($name), value));
}
)*
Box::new(vec.into_iter())
}
}

Expand Down