use std::collections::HashMap

This commit is contained in:
Richard Feldman 2020-06-30 07:54:05 -04:00
parent d744567f76
commit f5bcfd4dc4

View file

@ -22,15 +22,13 @@ mod test_usage_analysis {
use roc_uniq::sharing::FieldAccess; use roc_uniq::sharing::FieldAccess;
use roc_uniq::sharing::VarUsage; use roc_uniq::sharing::VarUsage;
use roc_uniq::sharing::{Container, Mark, Usage}; use roc_uniq::sharing::{Container, Mark, Usage};
use std::collections::HashMap;
use Container::*; use Container::*;
use Mark::*; use Mark::*;
use Usage::*; use Usage::*;
fn field_access_seq( fn field_access_seq(accesses: Vec<Vec<&str>>, expected_ref: HashMap<&str, Usage>) {
accesses: Vec<Vec<&str>>,
expected_ref: std::collections::HashMap<&str, Usage>,
) {
use Mark::*; use Mark::*;
use Usage::*; use Usage::*;
@ -43,13 +41,12 @@ mod test_usage_analysis {
match usage { match usage {
Usage::Access(_, _, fields) => { Usage::Access(_, _, fields) => {
let mut actual: std::collections::HashMap<Lowercase, Usage> = let mut actual: HashMap<Lowercase, Usage> = HashMap::default();
std::collections::HashMap::default();
for (k, v) in fields.into_iter() { for (k, v) in fields.into_iter() {
actual.insert(k, v); actual.insert(k, v);
} }
let mut expected = std::collections::HashMap::default(); let mut expected = HashMap::default();
for (k, v) in expected_ref { for (k, v) in expected_ref {
expected.insert(k.into(), v); expected.insert(k.into(), v);
} }
@ -60,10 +57,7 @@ mod test_usage_analysis {
} }
} }
fn field_access_par( fn field_access_par(accesses: Vec<Vec<&str>>, expected_ref: HashMap<&str, Usage>) {
accesses: Vec<Vec<&str>>,
expected_ref: std::collections::HashMap<&str, Usage>,
) {
use Mark::*; use Mark::*;
use Usage::*; use Usage::*;
@ -76,13 +70,12 @@ mod test_usage_analysis {
match usage { match usage {
Usage::Access(_, _, fields) => { Usage::Access(_, _, fields) => {
let mut actual: std::collections::HashMap<Lowercase, Usage> = let mut actual: HashMap<Lowercase, Usage> = HashMap::default();
std::collections::HashMap::default();
for (k, v) in fields.into_iter() { for (k, v) in fields.into_iter() {
actual.insert(k, v); actual.insert(k, v);
} }
let mut expected = std::collections::HashMap::default(); let mut expected = HashMap::default();
for (k, v) in expected_ref { for (k, v) in expected_ref {
expected.insert(k.into(), v); expected.insert(k.into(), v);
} }
@ -93,7 +86,7 @@ mod test_usage_analysis {
} }
} }
fn field_access(fields: std::collections::HashMap<&str, Usage>) -> FieldAccess { fn field_access(fields: HashMap<&str, Usage>) -> FieldAccess {
let mut new_fields = ImMap::default(); let mut new_fields = ImMap::default();
for (k, v) in fields { for (k, v) in fields {