Skip to content

Commit 33f5885

Browse files
committed
---
yaml --- r: 135317 b: refs/heads/snap-stage3 c: f14cb96 h: refs/heads/master i: 135315: c1b2100 v: v3
1 parent 2ddcbc9 commit 33f5885

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4184396f28d5612520f7b30718df9fff6918d239
4+
refs/heads/snap-stage3: f14cb96b07517b5638bf966e6f6e30b946552912
55
refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,11 @@ impl<T> Vec<T> {
848848
let ptr = self.ptr;
849849
let cap = self.cap;
850850
let begin = self.ptr as *const T;
851-
let end = (self.ptr as uint + self.len()) as *const T;
851+
let end = if mem::size_of::<T>() == 0 {
852+
(ptr as uint + self.len()) as *const T;
853+
} else {
854+
ptr.offset(self.len() as int)
855+
};
852856
mem::forget(self);
853857
MoveItems { allocation: ptr, cap: cap, ptr: begin, end: end }
854858
}

0 commit comments

Comments
 (0)