upstream rust: hashmap changes