diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-09-11 17:17:54 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2012-09-11 20:02:34 -0700 |
| commit | c087886e9321d6086ed3a623ec571da35fb865bf (patch) | |
| tree | 51949005b792266cf48fe1f53b25cc587732eb75 /src/libcore/dvec.rs | |
| parent | 2c6c963f61d84d2a959df0d5c82f519c157ef552 (diff) | |
| download | rust-c087886e9321d6086ed3a623ec571da35fb865bf.tar.gz rust-c087886e9321d6086ed3a623ec571da35fb865bf.zip | |
Make moves explicit in arguments
Diffstat (limited to 'src/libcore/dvec.rs')
| -rw-r--r-- | src/libcore/dvec.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libcore/dvec.rs b/src/libcore/dvec.rs index 35424a38fd8..ed8a814bba8 100644 --- a/src/libcore/dvec.rs +++ b/src/libcore/dvec.rs @@ -95,7 +95,7 @@ priv impl<A> DVec<A> { data <-> self.data; let data_ptr: *() = unsafe::reinterpret_cast(&data); if data_ptr.is_null() { fail ~"Recursive use of dvec"; } - return f(data); + return f(move data); } } @@ -123,7 +123,7 @@ impl<A> DVec<A> { */ #[inline(always)] fn swap(f: fn(-~[mut A]) -> ~[mut A]) { - self.check_out(|v| self.give_back(f(v))) + self.check_out(|v| self.give_back(f(move v))) } /// Returns the number of elements currently in the dvec @@ -131,7 +131,7 @@ impl<A> DVec<A> { unchecked { do self.check_out |v| { let l = v.len(); - self.give_back(v); + self.give_back(move v); l } } @@ -148,7 +148,7 @@ impl<A> DVec<A> { do self.check_out |v| { let mut v <- v; let result = vec::pop(v); - self.give_back(v); + self.give_back(move v); move result } } @@ -162,7 +162,7 @@ impl<A> DVec<A> { if data_ptr.is_null() { fail ~"Recursive use of dvec"; } log(error, ~"a"); self.data <- ~[mut move t]; - vec::push_all_move(self.data, data); + vec::push_all_move(self.data, move data); log(error, ~"b"); } } @@ -187,7 +187,7 @@ impl<A> DVec<A> { fn reverse() { do self.check_out |v| { vec::reverse(v); - self.give_back(v); + self.give_back(move v); } } @@ -195,7 +195,7 @@ impl<A> DVec<A> { fn borrow<R>(op: fn(x: &[A]) -> R) -> R { do self.check_out |v| { let result = op(v); - self.give_back(v); + self.give_back(move v); move result } } @@ -204,7 +204,7 @@ impl<A> DVec<A> { fn borrow_mut<R>(op: fn(x: &[mut A]) -> R) -> R { do self.check_out |v| { let result = op(v); - self.give_back(v); + self.give_back(move v); move result } } @@ -269,7 +269,7 @@ impl<A: Copy> DVec<A> { unchecked { do self.check_out |v| { let w = vec::from_mut(copy v); - self.give_back(v); + self.give_back(move v); move w } } |
