Skip to content

Commit 3eb199f

Browse files
committed
---
yaml --- r: 6744 b: refs/heads/master c: b5e5043 h: refs/heads/master v: v3
1 parent 73d28bc commit 3eb199f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: ac6aba016e757c6eea58742c9f9cd6348caba616
2+
refs/heads/master: b5e5043d5d8adecb04cf25a1be0e186d96d2f82a

trunk/src/libstd/bitv.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn create(nbits: uint, init: bool) -> t {
5353
ret @{storage: storage, nbits: nbits};
5454
}
5555

56-
fn process(op: block(uint, uint) -> uint, v0: t, v1: t) -> bool {
56+
fn process(v0: t, v1: t, op: block(uint, uint) -> uint) -> bool {
5757
let len = vec::len(v1.storage);
5858
assert (vec::len(v0.storage) == len);
5959
assert (v0.nbits == v1.nbits);
@@ -70,7 +70,7 @@ fn process(op: block(uint, uint) -> uint, v0: t, v1: t) -> bool {
7070

7171
fn lor(w0: uint, w1: uint) -> uint { ret w0 | w1; }
7272

73-
fn union(v0: t, v1: t) -> bool { let sub = lor; ret process(sub, v0, v1); }
73+
fn union(v0: t, v1: t) -> bool { let sub = lor; ret process(v0, v1, sub); }
7474

7575
fn land(w0: uint, w1: uint) -> uint { ret w0 & w1; }
7676

@@ -91,7 +91,7 @@ True if `v0` was changed
9191
*/
9292
fn intersect(v0: t, v1: t) -> bool {
9393
let sub = land;
94-
ret process(sub, v0, v1);
94+
ret process(v0, v1, sub);
9595
}
9696

9797
fn right(_w0: uint, w1: uint) -> uint { ret w1; }
@@ -109,7 +109,7 @@ Returns:
109109
110110
True if `v0` was changed
111111
*/
112-
fn assign(v0: t, v1: t) -> bool { let sub = right; ret process(sub, v0, v1); }
112+
fn assign(v0: t, v1: t) -> bool { let sub = right; ret process(v0, v1, sub); }
113113

114114
/*
115115
Function: clone

0 commit comments

Comments
 (0)