Skip to content

Commit 2b452ae

Browse files
committed
---
yaml --- r: 155616 b: refs/heads/try2 c: f14cb96 h: refs/heads/master v: v3
1 parent 6dbc2e9 commit 2b452ae

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4184396f28d5612520f7b30718df9fff6918d239
8+
refs/heads/try2: f14cb96b07517b5638bf966e6f6e30b946552912
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)