diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-08 01:42:07 -0700 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-08 01:42:07 -0700 |
| commit | 44770ae3a8001de38b33e449889c6444808941fc (patch) | |
| tree | 35b19c50d284bb5a25a3259692dc3783ec95c704 /src/libstd/task | |
| parent | 96ae000812079b284011571dc18fed0d1fb433d8 (diff) | |
| parent | 641aec74076f8c5735a7d379753194f877866525 (diff) | |
| download | rust-44770ae3a8001de38b33e449889c6444808941fc.tar.gz rust-44770ae3a8001de38b33e449889c6444808941fc.zip | |
Merge pull request #7595 from thestinger/iterator
remove some method resolve workarounds
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 0956b76c970..8dd96df4545 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).iter().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).iter().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); } } |