Skip to content

enum_derive::IterVariantNames trait #32

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

Open
main-- wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enum_derive::IterVariantNames trait #32

Show file tree
Hide file tree
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
21 changes: 15 additions & 6 deletions enum_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ macro_attr! {
}

# fn main() {
use enum_derive::IterVariantNames;
let vars: CandyVariants = Candy::iter_variants();
let names: CandyVariantNames = Candy::iter_variant_names();
assert_eq!(&*vars.zip(names).collect::<Vec<_>>(), &[
Expand Down Expand Up @@ -453,9 +454,10 @@ macro_rules! IterVariantNames {

enum_derive_util! {
@as_item
impl $name {
#[allow(dead_code)]
$($pub_)* fn iter_variant_names() -> $itername {
impl ::enum_derive::IterVariantNames for $name {
type Iterator = $itername;

fn iter_variant_names() -> $itername {
$itername
}
}
Expand All @@ -471,9 +473,10 @@ macro_rules! IterVariantNames {

enum_derive_util! {
@as_item
impl $name {
#[allow(dead_code)]
$($pub_)* fn iter_variant_names() -> $itername {
impl ::enum_derive::IterVariantNames for $name {
type Iterator = $itername;

fn iter_variant_names() -> $itername {
$itername(::std::option::Option::Some(enum_derive_util!(@first_expr $($name::$var_names),+)))
}
}
Expand Down Expand Up @@ -966,3 +969,9 @@ macro_rules! EnumInnerAsTrait {
}
};
}

pub trait IterVariantNames {
type Iterator: Iterator<Item=&'static str>;

fn iter_variant_names() -> Self::Iterator;
}
2 changes: 2 additions & 0 deletions enum_derive/tests/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ or distributed except according to those terms.
#[macro_use] extern crate enum_derive;
#[macro_use] extern crate macro_attr;

use enum_derive::IterVariantNames;

macro_attr! {
#[derive(Debug, PartialEq, IterVariants!(GetVariants), IterVariantNames!(GetVariantNames))]
pub enum Get {
Expand Down