Skip to content

Commit 1a323f7

Browse files
GealGeal
committed
Automated fixes to follow Rust development
Applied fixes: *attribute fix (cf rust-lang/rust#2569) *Rename Chan to Sender (cf rust-lang/rust@7858065) *New vec library (cf rust-lang/rust#12771) *priv attribute removal (cf rust-lang/rust@f2a5c7a) *Replace Freeze by Share (cf rust-lang/rust@12ecafb)
1 parent 76d6cda commit 1a323f7

File tree

5 files changed

+75
-72
lines changed

5 files changed

+75
-72
lines changed

‎hamt.rs

+41-40
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ use std::hash::{Hasher, Hash};
2929
use std::intrinsics;
3030
use std::mem;
3131
use std::ptr;
32-
use std::vec;
32+
use std::vec::Vec;
3333
use std::sync::atomics::{AtomicUint, Acquire, Release};
3434
use std::rt::global_heap::{exchange_malloc, exchange_free};
35+
use std::kinds::Share;
3536

3637
use sync::Arc;
3738
use PersistentMap;
@@ -54,7 +55,7 @@ enum NodeRefBorrowResult<'a, K, V, IS, H> {
5455
SharedNode(&'a UnsafeNode<K, V, IS, H>),
5556
}
5657

57-
impl<K: Eq+Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>> NodeRef<K, V, IS, H> {
58+
impl<K: Eq+Send+Share, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>> NodeRef<K, V, IS, H> {
5859

5960
fn borrow<'a>(&'a self) -> &'a UnsafeNode<K, V, IS, H> {
6061
unsafe {
@@ -164,7 +165,7 @@ enum NodeEntryRef<'a, K, V, IS, H> {
164165
SubTreeEntryRef(&'a NodeRef<K, V, IS, H>)
165166
}
166167

167-
impl<'a, K: Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, H> NodeEntryRef<'a, K, V, IS, H> {
168+
impl<'a, K: Send+Share, V: Send+Share, IS: ItemStore<K, V>, H> NodeEntryRef<'a, K, V, IS, H> {
168169
// Clones the contents of a NodeEntryRef into a NodeEntryOwned value to be used elsewhere.
169170
fn clone_out(&self) -> NodeEntryOwned<K, V, IS, H> {
170171
match *self {
@@ -195,7 +196,7 @@ enum NodeEntryOwned<K, V, IS, H> {
195196
// safe space and---later on during searches---time.
196197
enum RemovalResult<K, V, IS, H> {
197198
// Don't do anything
198-
NoChange,
199+
NoSenderge,
199200
// Replace the sub-tree entry with another sub-tree entry pointing to the given node
200201
ReplaceSubTree(NodeRef<K, V, IS, H>),
201202
// Collapse the sub-tree into a singe-item entry
@@ -372,7 +373,7 @@ impl<K, V, IS, H> UnsafeNode<K, V, IS, H> {
372373
}
373374

374375
// impl UnsafeNode (continued)
375-
impl<K: Eq+Send+Freeze+Hash<S>, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>>
376+
impl<K: Eq+Send+Share+Hash<S>, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>>
376377
UnsafeNode<K, V, IS, H> {
377378
// Insert a new key-value pair into the tree. The existing tree is not modified and a new tree
378379
// is created. This new tree will share most nodes with the existing one.
@@ -450,7 +451,7 @@ UnsafeNode<K, V, IS, H> {
450451
None => {
451452
*insertion_count = 1;
452453

453-
let mut new_items = vec::with_capacity(items.len() + 1);
454+
let mut new_items = Vec::with_capacity(items.len() + 1);
454455
new_items.push(new_kvp);
455456
new_items.push_all(items.as_slice());
456457
new_items
@@ -459,7 +460,7 @@ UnsafeNode<K, V, IS, H> {
459460
*insertion_count = 0;
460461

461462
let item_count = items.len();
462-
let mut new_items = vec::with_capacity(item_count);
463+
let mut new_items = Vec::with_capacity(item_count);
463464

464465
if position > 0 {
465466
new_items.push_all(items.slice_to(position));
@@ -572,7 +573,7 @@ UnsafeNode<K, V, IS, H> {
572573
None => {
573574
*insertion_count = 1;
574575

575-
let mut new_items = vec::with_capacity(items.len() + 1);
576+
let mut new_items = Vec::with_capacity(items.len() + 1);
576577
new_items.push(new_kvp);
577578
new_items.push_all(items.as_slice());
578579
new_items
@@ -581,7 +582,7 @@ UnsafeNode<K, V, IS, H> {
581582
*insertion_count = 0;
582583

583584
let item_count = items.len();
584-
let mut new_items = vec::with_capacity(item_count);
585+
let mut new_items = Vec::with_capacity(item_count);
585586

586587
if position > 0 {
587588
new_items.push_all(items.slice_to(position));
@@ -649,7 +650,7 @@ UnsafeNode<K, V, IS, H> {
649650

650651
if (self.mask & (1 << local_key)) == 0 {
651652
*removal_count = 0;
652-
return NoChange;
653+
return NoSenderge;
653654
}
654655

655656
let index = get_index(self.mask, local_key);
@@ -661,7 +662,7 @@ UnsafeNode<K, V, IS, H> {
661662
self.collapse_kill_or_change(local_key, index)
662663
} else {
663664
*removal_count = 0;
664-
NoChange
665+
NoSenderge
665666
}
666667
}
667668
CollisionEntryRef(items_ref) => {
@@ -672,7 +673,7 @@ UnsafeNode<K, V, IS, H> {
672673
match position {
673674
None => {
674675
*removal_count = 0;
675-
NoChange
676+
NoSenderge
676677
},
677678
Some(position) => {
678679
*removal_count = 1;
@@ -681,7 +682,7 @@ UnsafeNode<K, V, IS, H> {
681682
// The new entry can either still be a collision node, or it can be a simple
682683
// single-item node if the hash collision has been resolved by the removal
683684
let new_entry = if item_count > 1 {
684-
let mut new_items = vec::with_capacity(item_count);
685+
let mut new_items = Vec::with_capacity(item_count);
685686

686687
if position > 0 {
687688
new_items.push_all(items.slice_to(position));
@@ -712,7 +713,7 @@ UnsafeNode<K, V, IS, H> {
712713
key,
713714
removal_count);
714715
match result {
715-
NoChange => NoChange,
716+
NoSenderge => NoSenderge,
716717
ReplaceSubTree(x) => {
717718
ReplaceSubTree(self.copy_with_new_entry(local_key, SubTreeEntryOwned(x)))
718719
}
@@ -745,13 +746,13 @@ UnsafeNode<K, V, IS, H> {
745746

746747
if (self.mask & (1 << local_key)) == 0 {
747748
*removal_count = 0;
748-
return NoChange;
749+
return NoSenderge;
749750
}
750751

751752
let index = get_index(self.mask, local_key);
752753

753754
enum Action<K, V, IS, H> {
754-
CollapseKillOrChange,
755+
CollapseKillOrSenderge,
755756
NoAction,
756757
ReplaceEntry(NodeEntryOwned<K, V, IS, H>)
757758
}
@@ -760,7 +761,7 @@ UnsafeNode<K, V, IS, H> {
760761
ItemEntryMutRef(existing_kvp_ref) => {
761762
if *existing_kvp_ref.key() == *key {
762763
*removal_count = 1;
763-
CollapseKillOrChange
764+
CollapseKillOrSenderge
764765
} else {
765766
*removal_count = 0;
766767
NoAction
@@ -783,7 +784,7 @@ UnsafeNode<K, V, IS, H> {
783784
// The new entry can either still be a collision node, or it can be a simple
784785
// single-item node if the hash collision has been resolved by the removal
785786
let new_entry = if item_count > 1 {
786-
let mut new_items = vec::with_capacity(item_count);
787+
let mut new_items = Vec::with_capacity(item_count);
787788

788789
if position > 0 {
789790
new_items.push_all(items.slice_to(position));
@@ -820,7 +821,7 @@ UnsafeNode<K, V, IS, H> {
820821
};
821822

822823
match result {
823-
NoChange => NoAction,
824+
NoSenderge => NoAction,
824825
ReplaceSubTree(x) => {
825826
ReplaceEntry(SubTreeEntryOwned(x))
826827
}
@@ -832,18 +833,18 @@ UnsafeNode<K, V, IS, H> {
832833
ReplaceEntry(ItemEntryOwned(kvp))
833834
},
834835
KillSubTree => {
835-
CollapseKillOrChange
836+
CollapseKillOrSenderge
836837
}
837838
}
838839
}
839840
};
840841

841842
match action {
842-
NoAction => NoChange,
843-
CollapseKillOrChange => self.collapse_kill_or_change_in_place(local_key, index),
843+
NoAction => NoSenderge,
844+
CollapseKillOrSenderge => self.collapse_kill_or_change_in_place(local_key, index),
844845
ReplaceEntry(new_entry) => {
845846
self.insert_entry_in_place(local_key, new_entry);
846-
NoChange
847+
NoSenderge
847848
}
848849
}
849850
}
@@ -882,7 +883,7 @@ UnsafeNode<K, V, IS, H> {
882883

883884
if new_entry_count > 1 {
884885
self.remove_entry_in_place(local_key);
885-
NoChange
886+
NoSenderge
886887
} else if new_entry_count == 1 {
887888
let other_index = 1 - entry_index;
888889

@@ -894,7 +895,7 @@ UnsafeNode<K, V, IS, H> {
894895
}
895896

896897
self.remove_entry_in_place(local_key);
897-
NoChange
898+
NoSenderge
898899
} else {
899900
assert!(new_entry_count == 0);
900901
KillSubTree
@@ -1124,7 +1125,7 @@ pub struct HamtMap<K, V, IS, H> {
11241125
}
11251126

11261127
// impl HamtMap
1127-
impl<K: Eq+Send+Freeze+Hash<S>, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
1128+
impl<K: Eq+Send+Share+Hash<S>, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
11281129
HamtMap<K, V, IS, H> {
11291130

11301131
pub fn new(hasher: H) -> HamtMap<K, V, IS, H> {
@@ -1227,7 +1228,7 @@ HamtMap<K, V, IS, H> {
12271228
let new_element_count = element_count - removal_count;
12281229

12291230
(match removal_result {
1230-
NoChange => HamtMap {
1231+
NoSenderge => HamtMap {
12311232
root: root,
12321233
hasher: hasher,
12331234
element_count: new_element_count
@@ -1262,7 +1263,7 @@ HamtMap<K, V, IS, H> {
12621263
}
12631264

12641265
// Clone for HamtMap
1265-
impl<K: Eq+Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
1266+
impl<K: Eq+Send+Share, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
12661267
Clone for HamtMap<K, V, IS, H> {
12671268

12681269
fn clone(&self) -> HamtMap<K, V, IS, H> {
@@ -1275,7 +1276,7 @@ Clone for HamtMap<K, V, IS, H> {
12751276
}
12761277

12771278
// Container for HamtMap
1278-
impl<K: Eq+Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>>
1279+
impl<K: Eq+Send+Share, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>>
12791280
Container for HamtMap<K, V, IS, H> {
12801281

12811282
fn len(&self) -> uint {
@@ -1284,7 +1285,7 @@ Container for HamtMap<K, V, IS, H> {
12841285
}
12851286

12861287
// Map for HamtMap
1287-
impl<K: Eq+Send+Freeze+Hash<S>, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
1288+
impl<K: Eq+Send+Share+Hash<S>, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>+Clone>
12881289
Map<K, V> for HamtMap<K, V, IS, H> {
12891290

12901291
fn find<'a>(&'a self, key: &K) -> Option<&'a V> {
@@ -1293,7 +1294,7 @@ Map<K, V> for HamtMap<K, V, IS, H> {
12931294
}
12941295

12951296
// PersistentMap for HamtMap<CopyStore>
1296-
impl<K: Eq+Send+Freeze+Clone+Hash<S>, V: Send+Freeze+Clone, S, H: Hasher<S>+Clone>
1297+
impl<K: Eq+Send+Share+Clone+Hash<S>, V: Send+Share+Clone, S, H: Hasher<S>+Clone>
12971298
PersistentMap<K, V> for HamtMap<K, V, CopyStore<K, V>, H> {
12981299

12991300
fn insert(self, key: K, value: V) -> (HamtMap<K, V, CopyStore<K, V>, H>, bool) {
@@ -1306,7 +1307,7 @@ PersistentMap<K, V> for HamtMap<K, V, CopyStore<K, V>, H> {
13061307
}
13071308

13081309
// PersistentMap for HamtMap<ShareStore>
1309-
impl<K: Eq+Send+Freeze+Hash<S>, V: Send+Freeze, S, H: Hasher<S>+Clone>
1310+
impl<K: Eq+Send+Share+Hash<S>, V: Send+Share, S, H: Hasher<S>+Clone>
13101311
PersistentMap<K, V> for HamtMap<K, V, ShareStore<K, V>, H> {
13111312

13121313
fn insert(self, key: K, value: V) -> (HamtMap<K, V, ShareStore<K, V>, H>, bool) {
@@ -1331,12 +1332,12 @@ enum IteratorNodeRef<'a, K, V, IS, H> {
13311332
}
13321333

13331334
pub struct HamtMapIterator<'a, K, V, IS, H> {
1334-
priv node_stack: [(IteratorNodeRef<'a, K, V, IS, H>, int), .. LAST_LEVEL + 2],
1335-
priv stack_size: uint,
1336-
priv len: uint,
1335+
node_stack: [(IteratorNodeRef<'a, K, V, IS, H>, int), .. LAST_LEVEL + 2],
1336+
stack_size: uint,
1337+
len: uint,
13371338
}
13381339

1339-
impl<'a, K: Eq+Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>>
1340+
impl<'a, K: Eq+Send+Share, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>>
13401341
HamtMapIterator<'a, K, V, IS, H> {
13411342

13421343
fn new<'a>(map: &'a HamtMap<K, V, IS, H>) -> HamtMapIterator<'a, K, V, IS, H> {
@@ -1351,7 +1352,7 @@ HamtMapIterator<'a, K, V, IS, H> {
13511352
}
13521353
}
13531354

1354-
impl<'a, K: Eq+Send+Freeze, V: Send+Freeze, IS: ItemStore<K, V>, S, H: Hasher<S>>
1355+
impl<'a, K: Eq+Send+Share, V: Send+Share, IS: ItemStore<K, V>, S, H: Hasher<S>>
13551356
Iterator<(&'a K, &'a V)> for HamtMapIterator<'a, K, V, IS, H> {
13561357

13571358
fn next(&mut self) -> Option<(&'a K, &'a V)> {
@@ -1418,7 +1419,7 @@ struct HamtSet<V, H> {
14181419
}
14191420

14201421
// Set for HamtSet
1421-
impl<V: Send+Freeze+Eq+Hash<S>, S, H: Hasher<S>+Clone>
1422+
impl<V: Send+Share+Eq+Hash<S>, S, H: Hasher<S>+Clone>
14221423
Set<V> for HamtSet<V, H> {
14231424
fn contains(&self, value: &V) -> bool {
14241425
self.data.contains_key(value)
@@ -1454,7 +1455,7 @@ Set<V> for HamtSet<V, H> {
14541455
}
14551456

14561457
// Clone for HamtSet
1457-
impl<V: Eq+Send+Freeze, S, H: Hasher<S>+Clone>
1458+
impl<V: Eq+Send+Share, S, H: Hasher<S>+Clone>
14581459
Clone for HamtSet<V, H> {
14591460

14601461
fn clone(&self) -> HamtSet<V, H> {
@@ -1465,7 +1466,7 @@ Clone for HamtSet<V, H> {
14651466
}
14661467

14671468
// Container for HamtSet
1468-
impl<V: Eq+Send+Freeze, S, H: Hasher<S>>
1469+
impl<V: Eq+Send+Share, S, H: Hasher<S>>
14691470
Container for HamtSet<V, H> {
14701471

14711472
fn len(&self) -> uint {

‎item_store.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
use sync::Arc;
3+
use std::kinds::Share;
34

4-
pub trait ItemStore<K, V>: Clone+Send+Freeze {
5+
pub trait ItemStore<K, V>: Clone+Send+Share {
56
fn key<'a>(&'a self) -> &'a K;
67
fn val<'a>(&'a self) -> &'a V;
78
}
@@ -11,12 +12,12 @@ pub struct CopyStore<K, V> {
1112
val: V
1213
}
1314

14-
impl<K: Clone+Send+Freeze, V: Clone+Send+Freeze> ItemStore<K, V> for CopyStore<K, V> {
15+
impl<K: Clone+Send+Share, V: Clone+Send+Share> ItemStore<K, V> for CopyStore<K, V> {
1516
fn key<'a>(&'a self) -> &'a K { &self.key }
1617
fn val<'a>(&'a self) -> &'a V { &self.val }
1718
}
1819

19-
impl<K: Clone+Send+Freeze, V: Clone+Send+Freeze> Clone for CopyStore<K, V> {
20+
impl<K: Clone+Send+Share, V: Clone+Send+Share> Clone for CopyStore<K, V> {
2021
fn clone(&self) -> CopyStore<K, V> {
2122
CopyStore {
2223
key: self.key.clone(),
@@ -29,18 +30,18 @@ pub struct ShareStore<K, V> {
2930
store: Arc<(K, V)>,
3031
}
3132

32-
impl<K: Send+Freeze, V: Send+Freeze> ShareStore<K, V> {
33+
impl<K: Send+Share, V: Send+Share> ShareStore<K, V> {
3334
pub fn new(k: K, v: V) -> ShareStore<K, V> {
3435
ShareStore { store: Arc::new((k, v)) }
3536
}
3637
}
3738

38-
impl<K: Send+Freeze, V: Send+Freeze> ItemStore<K, V> for ShareStore<K, V> {
39+
impl<K: Send+Share, V: Send+Share> ItemStore<K, V> for ShareStore<K, V> {
3940
fn key<'a>(&'a self) -> &'a K { self.store.get().ref0() }
4041
fn val<'a>(&'a self) -> &'a V { self.store.get().ref1() }
4142
}
4243

43-
impl<K: Send+Freeze, V: Send+Freeze> Clone for ShareStore<K, V> {
44+
impl<K: Send+Share, V: Send+Share> Clone for ShareStore<K, V> {
4445
fn clone(&self) -> ShareStore<K, V> {
4546
ShareStore {
4647
store: self.store.clone()

‎lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
//! information see [Wikipedia](https://en.wikipedia.org/wiki/Persistent_data_structure) for
2525
//! example.
2626
27-
#[feature(default_type_params)];
28-
#[feature(macro_rules)];
29-
#[allow(deprecated_owned_vector)];
27+
#![feature(default_type_params)]
28+
#![feature(macro_rules)]
29+
#![allow(deprecated_owned_vector)]
3030

3131
#[cfg(test)]
3232
extern crate test;

0 commit comments

Comments
 (0)