---

bluss · bluss · commit 6b9748e8c86c · 2016-03-02T18:05:40.000+01:00
yaml --- r: 272747 b: refs/heads/beta c: 1da364e h: refs/heads/master i: 272745: aaa7f43 272743: e534909
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: c0f8b085942c0c914c3c9d175303c23e1b4158e3
+refs/heads/beta: 1da364e98f46c828e5746be299b58b995e5f5007
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/libcollections/vec.rs b/branches/beta/src/libcollections/vec.rs
@@ -497,10 +497,11 @@ impl<T> Vec<T> {
         unsafe {
             // drop any extra elements
             while len < self.len {
-                // decrement len before the read(), so a panic on Drop doesn't
-                // re-drop the just-failed value.
+                // decrement len before the drop_in_place(), so a panic on Drop
+                // doesn't re-drop the just-failed value.
                 self.len -= 1;
-                ptr::read(self.get_unchecked(self.len));
+                let len = self.len;
+                ptr::drop_in_place(self.get_unchecked_mut(len));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -497,10 +497,11 @@ impl<T> Vec<T> {`
`497`	`497`	`unsafe {`
`498`	`498`	`// drop any extra elements`
`499`	`499`	`while len < self.len {`
`500`		`- // decrement len before the read(), so a panic on Drop doesn't`
`501`		`- // re-drop the just-failed value.`
	`500`	`+ // decrement len before the drop_in_place(), so a panic on Drop`
	`501`	`+ // doesn't re-drop the just-failed value.`
`502`	`502`	`self.len -= 1;`
`503`		`- ptr::read(self.get_unchecked(self.len));`
	`503`	`+ let len = self.len;`
	`504`	`+ ptr::drop_in_place(self.get_unchecked_mut(len));`
`504`	`505`	`}`
`505`	`506`	`}`
`506`	`507`	`}`