OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Box the tuples returned by hashmap.items() for now since we don't have alias iterators yet

Browse Source
This commit is contained in:
Patrick Walton 2011-03-18 15:18:45 -07:00
parent ebee49314b
commit 47d650e25b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/comp/middle/trans.rs
View File

@ -5698,7 +5698,7 @@ fn find_main_fn(@crate_ctxt cx) -> ValueRef {
auto e = sep() + "main";
let ValueRef v = C_nil();
let uint n = 0u;
for each (tup(str,ValueRef) i in cx.item_names.items()) {
for each (@tup(str,ValueRef) i in cx.item_names.items()) {
if (_str.ends_with(i._0, e)) {
n += 1u;
v = i._1;

6
src/lib/map.rs
View File

@ -14,7 +14,7 @@ abs state type hashmap[K, V] = state obj {
fn find(&K key) -> option.t[V];
fn remove(&K key) -> option.t[V];
fn rehash();
iter items() -> tup(K,V);
iter items() -> @tup(K,V);
};
fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
@ -216,11 +216,11 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
bkts = newbkts;
}
iter items() -> tup(K,V) {
iter items() -> @tup(K,V) {
for (bucket[K,V] b in bkts) {
alt (b) {
case(some[K,V](?k,?v)) {
put tup(k,v);
put @tup(k,v);
}
case (_) { }
}