Skip to content

Commit 74a46ea

Browse files
committed
std: More demoding
1 parent 565b39b commit 74a46ea

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

src/libstd/bitv.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,17 @@ impl BigBitv {
137137
}
138138

139139
#[inline(always)]
140-
fn each_storage(op: fn(&v: uint) -> bool) {
140+
fn each_storage(op: fn(v: &mut uint) -> bool) {
141141
for uint::range(0, self.storage.len()) |i| {
142142
let mut w = self.storage[i];
143-
let b = !op(w);
143+
let b = !op(&mut w);
144144
self.storage[i] = w;
145145
if !b { break; }
146146
}
147147
}
148148

149149
#[inline(always)]
150-
fn invert() { for self.each_storage() |w| { w = !w } }
150+
fn invert() { for self.each_storage() |w| { *w = !*w } }
151151

152152
#[inline(always)]
153153
fn union(b: &BigBitv, nbits: uint) -> bool {
@@ -337,7 +337,7 @@ impl Bitv {
337337
* bitvectors contain identical elements.
338338
*/
339339
#[inline(always)]
340-
fn equal(v1: Bitv) -> bool {
340+
fn equal(v1: &Bitv) -> bool {
341341
if self.nbits != v1.nbits { return false; }
342342
match self.rep {
343343
Small(ref b) => match v1.rep {
@@ -356,7 +356,7 @@ impl Bitv {
356356
fn clear() {
357357
match self.rep {
358358
Small(ref b) => b.clear(),
359-
Big(ref s) => for s.each_storage() |w| { w = 0u }
359+
Big(ref s) => for s.each_storage() |w| { *w = 0u }
360360
}
361361
}
362362

@@ -365,15 +365,15 @@ impl Bitv {
365365
fn set_all() {
366366
match self.rep {
367367
Small(ref b) => b.set_all(),
368-
Big(ref s) => for s.each_storage() |w| { w = !0u } }
368+
Big(ref s) => for s.each_storage() |w| { *w = !0u } }
369369
}
370370

371371
/// Invert all bits
372372
#[inline(always)]
373373
fn invert() {
374374
match self.rep {
375375
Small(ref b) => b.invert(),
376-
Big(ref s) => for s.each_storage() |w| { w = !w } }
376+
Big(ref s) => for s.each_storage() |w| { *w = !*w } }
377377
}
378378

379379
/**
@@ -386,7 +386,7 @@ impl Bitv {
386386
* Returns `true` if `v0` was changed.
387387
*/
388388
#[inline(always)]
389-
fn difference(v: ~Bitv) -> bool { self.do_op(Difference, v) }
389+
fn difference(v: &Bitv) -> bool { self.do_op(Difference, v) }
390390

391391
/// Returns true if all bits are 1
392392
#[inline(always)]
@@ -863,14 +863,14 @@ mod tests {
863863
fn test_equal_differing_sizes() {
864864
let v0 = Bitv(10u, false);
865865
let v1 = Bitv(11u, false);
866-
assert !v0.equal(v1);
866+
assert !v0.equal(&v1);
867867
}
868868

869869
#[test]
870870
fn test_equal_greatly_differing_sizes() {
871871
let v0 = Bitv(10u, false);
872872
let v1 = Bitv(110u, false);
873-
assert !v0.equal(v1);
873+
assert !v0.equal(&v1);
874874
}
875875

876876
#[test]
@@ -881,7 +881,7 @@ mod tests {
881881
let b = bitv::Bitv(1, true);
882882
b.set(0, true);
883883

884-
assert a.equal(b);
884+
assert a.equal(&b);
885885
}
886886

887887
#[test]
@@ -896,7 +896,7 @@ mod tests {
896896
b.set(i, true);
897897
}
898898

899-
assert a.equal(b);
899+
assert a.equal(&b);
900900
}
901901

902902
#[test]

src/libstd/c_vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn get<T: Copy>(t: CVec<T>, ofs: uint) -> T {
117117
*
118118
* Fails if `ofs` is greater or equal to the length of the vector
119119
*/
120-
fn set<T: Copy>(t: CVec<T>, ofs: uint, v: T) {
120+
fn set<T: Copy>(t: CVec<T>, ofs: uint, +v: T) {
121121
assert ofs < len(t);
122122
unsafe { *ptr::mut_offset((*t).base, ofs) = v };
123123
}

src/libstd/deque.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use core::cmp::{Eq};
88

99
trait Deque<T> {
1010
fn size() -> uint;
11-
fn add_front(T);
12-
fn add_back(T);
11+
fn add_front(+v: T);
12+
fn add_back(+v: T);
1313
fn pop_front() -> T;
1414
fn pop_back() -> T;
1515
fn peek_front() -> T;
@@ -55,7 +55,7 @@ fn create<T: Copy>() -> Deque<T> {
5555

5656
impl <T: Copy> Repr<T>: Deque<T> {
5757
fn size() -> uint { return self.nelts; }
58-
fn add_front(t: T) {
58+
fn add_front(+t: T) {
5959
let oldlo: uint = self.lo;
6060
if self.lo == 0u {
6161
self.lo = self.elts.len() - 1u;
@@ -68,7 +68,7 @@ fn create<T: Copy>() -> Deque<T> {
6868
self.elts.set_elt(self.lo, Some(t));
6969
self.nelts += 1u;
7070
}
71-
fn add_back(t: T) {
71+
fn add_back(+t: T) {
7272
if self.lo == self.hi && self.nelts != 0u {
7373
self.elts.swap(|v| grow(self.nelts, self.lo, move v));
7474
self.lo = 0u;

src/libstd/net_tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ impl TcpSocket {
738738
result::Result<~[u8], TcpErrData>>, TcpErrData> {
739739
read_start(&self)
740740
}
741-
fn read_stop(-read_port:
741+
fn read_stop(+read_port:
742742
comm::Port<result::Result<~[u8], TcpErrData>>) ->
743743
result::Result<(), TcpErrData> {
744744
read_stop(&self, move read_port)

src/libstd/par.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ fn map_slices<A: Copy Send, B: Copy Send>(
7272
}
7373

7474
/// A parallel version of map.
75-
pub fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
75+
pub fn map<A: Copy Send, B: Copy Send>(xs: &[A], f: fn~((&A)) -> B) -> ~[B] {
7676
vec::concat(map_slices(xs, || {
7777
fn~(_base: uint, slice : &[A], copy f) -> ~[B] {
78-
vec::map(slice, |x| f(*x))
78+
vec::map(slice, |x| f(x))
7979
}
8080
}))
8181
}
8282

8383
/// A parallel version of mapi.
84-
pub fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A],
85-
f: fn~(uint, A) -> B) -> ~[B] {
84+
pub fn mapi<A: Copy Send, B: Copy Send>(xs: &[A],
85+
f: fn~(uint, (&A)) -> B) -> ~[B] {
8686
let slices = map_slices(xs, || {
8787
fn~(base: uint, slice : &[A], copy f) -> ~[B] {
8888
vec::mapi(slice, |i, x| {
89-
f(i + base, *x)
89+
f(i + base, x)
9090
})
9191
}
9292
});
@@ -119,21 +119,21 @@ pub fn mapi_factory<A: Copy Send, B: Copy Send>(
119119
}
120120

121121
/// Returns true if the function holds for all elements in the vector.
122-
pub fn alli<A: Copy Send>(xs: ~[A], f: fn~(uint, A) -> bool) -> bool {
122+
pub fn alli<A: Copy Send>(xs: &[A], f: fn~(uint, (&A)) -> bool) -> bool {
123123
do vec::all(map_slices(xs, || {
124124
fn~(base: uint, slice : &[A], copy f) -> bool {
125125
vec::alli(slice, |i, x| {
126-
f(i + base, *x)
126+
f(i + base, x)
127127
})
128128
}
129129
})) |x| { *x }
130130
}
131131

132132
/// Returns true if the function holds for any elements in the vector.
133-
pub fn any<A: Copy Send>(xs: ~[A], f: fn~(A) -> bool) -> bool {
133+
pub fn any<A: Copy Send>(xs: &[A], f: fn~(&(A)) -> bool) -> bool {
134134
do vec::any(map_slices(xs, || {
135135
fn~(_base : uint, slice: &[A], copy f) -> bool {
136-
vec::any(slice, |x| f(*x))
136+
vec::any(slice, |x| f(x))
137137
}
138138
})) |x| { *x }
139139
}

0 commit comments

Comments
 (0)