diff options
| author | bors <bors@rust-lang.org> | 2013-06-21 01:49:50 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-21 01:49:50 -0700 |
| commit | b0e3ffd3805203420846296bc7d5a3c13dfd8b3a (patch) | |
| tree | 791c56423464c90ff6f14a56992ae62f621d4665 /src/libstd/task | |
| parent | ba05af7b1cbb5ccf25226ca5cd8d84f872426466 (diff) | |
| parent | 06bec77fafb1c30052b9c69a3fb17b2835cb608f (diff) | |
| download | rust-b0e3ffd3805203420846296bc7d5a3c13dfd8b3a.tar.gz rust-b0e3ffd3805203420846296bc7d5a3c13dfd8b3a.zip | |
auto merge of #7263 : thestinger/rust/iterator, r=graydon
Diffstat (limited to 'src/libstd/task')
| -rw-r--r-- | src/libstd/task/local_data_priv.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/task/local_data_priv.rs b/src/libstd/task/local_data_priv.rs index f6b14a51539..0956b76c970 100644 --- a/src/libstd/task/local_data_priv.rs +++ b/src/libstd/task/local_data_priv.rs @@ -142,7 +142,7 @@ unsafe fn local_data_lookup<T: 'static>( -> Option<(uint, *libc::c_void)> { let key_value = key_to_key_value(key); - let map_pos = (*map).position(|entry| + let map_pos = (*map).iter().position_(|entry| match *entry { Some((k,_,_)) => k == key_value, None => false @@ -215,7 +215,7 @@ pub unsafe fn local_set<T: 'static>( } None => { // Find an empty slot. If not, grow the vector. - match (*map).position(|x| x.is_none()) { + match (*map).iter().position_(|x| x.is_none()) { Some(empty_index) => { map[empty_index] = new_entry; } None => { map.push(new_entry); } } |