Skip to content

Commit 08ca4c3

Browse files
committed
---
yaml --- r: 16038 b: refs/heads/try c: 77bbd72 h: refs/heads/master v: v3
1 parent 961e01f commit 08ca4c3

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 23fcab927c898c2e65d0cf12859f2218ad4cb487
5+
refs/heads/try: 77bbd72171631223464057f79fcd82e81787e84c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/rope.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,6 @@ mod tests {
12901290
let string_len = str::len(*sample);
12911291
let rope_iter = iterator::char::start(r);
12921292
let mut equal = true;
1293-
let mut pos = 0u;
12941293
while equal {
12951294
alt(node::char_iterator::next(rope_iter)) {
12961295
option::none {
@@ -1303,7 +1302,6 @@ mod tests {
13031302
if ch != c { equal = false; break; }
13041303
}
13051304
}
1306-
pos += 1u;
13071305
}
13081306

13091307
assert equal;

branches/try/src/libstd/timer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ mod test {
241241
delayed_send(hl_loop, 1000u, test_ch, expected);
242242
};
243243

244-
let actual = alt recv_timeout(hl_loop, 1u, test_po) {
244+
alt recv_timeout(hl_loop, 1u, test_po) {
245245
none { successes += 1; }
246246
_ { failures += 1; }
247247
};

branches/try/src/libstd/uv_global_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ mod test {
150150
exit_ch_ptr));
151151
}
152152
crust fn simple_timer_cb(timer_ptr: *ll::uv_timer_t,
153-
status: libc::c_int) unsafe {
153+
_status: libc::c_int) unsafe {
154154
log(debug, "in simple timer cb");
155155
ll::timer_stop(timer_ptr);
156156
let hl_loop = get_gl();
157-
hl::interact(hl_loop) {|loop_ptr|
157+
hl::interact(hl_loop) {|_loop_ptr|
158158
log(debug, "closing timer");
159159
ll::close(timer_ptr, simple_timer_close_cb);
160160
log(debug, "about to deref exit_ch_ptr");

branches/try/src/libstd/uv_hl.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,6 @@ mod test {
236236
crust fn async_handle_cb(handle: *ll::uv_async_t, status: libc::c_int)
237237
unsafe {
238238
log(debug, #fmt("async_handle_cb handle %? status %?",handle,status));
239-
let hl_loop = (*(ll::get_data_for_uv_handle(handle)
240-
as *ah_data)).hl_loop;
241239
ll::close(handle, async_close_cb);
242240
}
243241
type ah_data = {

0 commit comments

Comments
 (0)