Skip to content

Commit ca4047a

Browse files
committed
---
yaml --- r: 10648 b: refs/heads/snap-stage3 c: 3b9848b h: refs/heads/master v: v3
1 parent 4a9b668 commit ca4047a

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e4c291530e4cc160eca30811e17d614f236147a4
4+
refs/heads/snap-stage3: 3b9848b869c17ca369fc8bc7703e727eb19a211d
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/libcore/arc.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ resource arc_destruct<T>(data: *libc::c_void) {
2828
unsafe {
2929
let data: ~arc_data<T> = unsafe::reinterpret_cast(data);
3030
let new_count = rustrt::rust_atomic_decrement(&mut data.count);
31-
let data_ptr : *() = unsafe::reinterpret_cast(data);
3231
assert new_count >= 0;
3332
if new_count == 0 {
3433
// drop glue takes over.
@@ -70,7 +69,6 @@ fn clone<T: const>(rc: &arc<T>) -> arc<T> {
7069
unsafe {
7170
let ptr: ~arc_data<T> = unsafe::reinterpret_cast(**rc);
7271
let new_count = rustrt::rust_atomic_increment(&mut ptr.count);
73-
let data_ptr : *() = unsafe::reinterpret_cast(ptr);
7472
assert new_count >= 2;
7573
unsafe::forget(ptr);
7674
}
@@ -97,7 +95,6 @@ impl methods<T: send> for exclusive<T> {
9795
// this makes me nervous...
9896
let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
9997
let new_count = rustrt::rust_atomic_increment(&mut ptr.count);
100-
let data_ptr : *() = unsafe::reinterpret_cast(ptr);
10198
assert new_count > 1;
10299
unsafe::forget(ptr);
103100
}

branches/snap-stage3/src/libcore/vec.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,13 +2193,6 @@ mod tests {
21932193
assert addr == addr_imm;
21942194
}
21952195

2196-
#[test]
2197-
fn test_unshift() {
2198-
let mut x = [1, 2, 3];
2199-
unshift(x, 0);
2200-
assert x == [0, 1, 2, 3];
2201-
}
2202-
22032196
#[test]
22042197
fn test_capacity() {
22052198
let mut v = [0u64];

0 commit comments

Comments
 (0)