grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename [hash_]mapx to [hash_]map_into

Browse Source
This commit is contained in:
Robert Habermeier 2016-05-31 17:29:01 +02:00
parent c62bfcddef
commit da9d6bf8d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/pod_account.rs
View File

@ -154,13 +154,13 @@ mod test {
balance: 0.into(), balance: 0.into(),
nonce: 0.into(), nonce: 0.into(),
code: vec![], code: vec![],
storage: mapx![1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 0, 6 => 0, 7 => 0] storage: map_into![1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 0, 6 => 0, 7 => 0]
}; };
let b = PodAccount { let b = PodAccount {
balance: 0.into(), balance: 0.into(),
nonce: 0.into(), nonce: 0.into(),
code: vec![], code: vec![],
storage: mapx![1 => 1, 2 => 3, 3 => 0, 5 => 0, 7 => 7, 8 => 0, 9 => 9] storage: map_into![1 => 1, 2 => 3, 3 => 0, 5 => 0, 7 => 7, 8 => 0, 9 => 9]
}; };
assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&b)), Some(AccountDiff { assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&b)), Some(AccountDiff {
balance: Diff::Same, balance: Diff::Same,

4
util/src/common.rs
View File

@ -36,7 +36,7 @@ macro_rules! hash_map {
} }
#[macro_export] #[macro_export]
macro_rules! hash_mapx { macro_rules! hash_map_into {
( $( $x:expr => $y:expr ),* ) => {{ ( $( $x:expr => $y:expr ),* ) => {{
let mut x = HashMap::new(); let mut x = HashMap::new();
$( $(
@ -58,7 +58,7 @@ macro_rules! map {
} }
#[macro_export] #[macro_export]
macro_rules! mapx { macro_rules! map_into {
( $( $x:expr => $y:expr ),* ) => {{ ( $( $x:expr => $y:expr ),* ) => {{
let mut x = BTreeMap::new(); let mut x = BTreeMap::new();
$( $(