Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

refactor map macro for more general use #3850

Merged
gui1117 merged 4 commits into from
Oct 22, 2019
Merged

refactor map macro for more general use #3850

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ede82
refactor map macro for more general use
yjhmelody Oct 18, 2019
27a83b0
use $(,)?
yjhmelody Oct 18, 2019
1953c6f
Update core/primitives/src/lib.rs
yjhmelody Oct 22, 2019
9feeb84
Update core/primitives/src/lib.rs
yjhmelody Oct 22, 2019
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
10 changes: 8 additions & 2 deletions core/primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@
/// Can be used to create a `HashMap`.
#[macro_export]
macro_rules! map {
($( $name:expr => $value:expr ),*) => (
($( $name:expr => $value:expr ),* ,) => (

@xlc xlc Oct 18, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can use $(,)? to handle optional trailing comma

@yjhmelody yjhmelody Oct 18, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I forget the syntax.

map!($($name => $value),*)
);

($( $name:expr => $value:expr ),* ) => (
vec![ $( ( $name, $value ) ),* ].into_iter().collect()
)
);
Comment thread
yjhmelody marked this conversation as resolved.
Outdated
}



use rstd::prelude::*;
use rstd::ops::Deref;
#[cfg(feature = "std")]
Expand Down