diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-07-08 16:20:38 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-07-08 16:29:54 -0700 |
| commit | fae33367692c634356d861dc4badb967dc72a573 (patch) | |
| tree | d73190f2523bed7d010da69442b0c28973631ac1 /src/libstd/task | |
| parent | b227583dadd1500bba7752c7e5d9f2ac931611bc (diff) | |
| parent | f503e539bf60416a731f9ecc12b6aab31ef2fe87 (diff) | |
| download | rust-fae33367692c634356d861dc4badb967dc72a573.tar.gz rust-fae33367692c634356d861dc4badb967dc72a573.zip | |
Merge remote-tracking branch 'mozilla/master'
Conflicts: src/libextra/test.rs src/libstd/rt/global_heap.rs src/libstd/unstable/lang.rs src/libstd/vec.rs
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); } } |