diff options
| author | bors <bors@rust-lang.org> | 2014-04-18 11:41:23 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-18 11:41:23 -0700 |
| commit | d1d8497e53af86687e701eea0fe2a41b0c4313eb (patch) | |
| tree | ac2ffc0405647555976c3b6b90e98a4e9398eb11 /src/libstd/sync | |
| parent | ce2bab68d69ee04e17c0165dbdb7b583d5a7c991 (diff) | |
| parent | 675b82657e7d9fd4c824ff3c6dbead1edd1ab515 (diff) | |
| download | rust-d1d8497e53af86687e701eea0fe2a41b0c4313eb.tar.gz rust-d1d8497e53af86687e701eea0fe2a41b0c4313eb.zip | |
auto merge of #13588 : alexcrichton/rust/no-more-growing, r=thestinger
This is all in preparation for DST. This removes all the growable/shrinkable methods from `~[T]`.
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/arc.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sync/deque.rs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/sync/arc.rs b/src/libstd/sync/arc.rs index 0d0bd740e41..498a6252a8f 100644 --- a/src/libstd/sync/arc.rs +++ b/src/libstd/sync/arc.rs @@ -23,12 +23,13 @@ use cast; use clone::Clone; +use iter::Iterator; use kinds::Send; use ops::Drop; use ptr::RawPtr; use sync::atomics::{fence, AtomicUint, Relaxed, Acquire, Release}; -use slice; use ty::Unsafe; +use vec::Vec; /// An atomically reference counted pointer. /// @@ -73,7 +74,8 @@ impl<T: Send> UnsafeArc<T> { ~[] // need to free data here } else { let ptr = new_inner(data, num_handles); - slice::from_fn(num_handles, |_| UnsafeArc { data: ptr }) + let v = Vec::from_fn(num_handles, |_| UnsafeArc { data: ptr }); + v.move_iter().collect() } } } diff --git a/src/libstd/sync/deque.rs b/src/libstd/sync/deque.rs index 8beadce2160..97239707d32 100644 --- a/src/libstd/sync/deque.rs +++ b/src/libstd/sync/deque.rs @@ -61,7 +61,7 @@ use ptr::RawPtr; use sync::arc::UnsafeArc; use sync::atomics::{AtomicInt, AtomicPtr, SeqCst}; use unstable::sync::Exclusive; -use slice::{OwnedVector, ImmutableVector}; +use slice::ImmutableVector; use vec::Vec; // Once the queue is less than 1/K full, then it will be downsized. Note that |
