Skip to content

Commit e82e361

Browse files
committed
---
yaml --- r: 234788 b: refs/heads/tmp c: 6beb4ba h: refs/heads/master v: v3
1 parent f04acdf commit e82e361

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: c5fa7776dff913dd75fed6f4e7ed483f0e75e367
28+
refs/heads/tmp: 6beb4ba1aaecb59fdfdc676434b5a3b17a4b5bfc
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/libcollections/vec.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,9 +1322,11 @@ impl<T> Drop for Vec<T> {
13221322
// OK because exactly when this stops being a valid assumption, we
13231323
// don't need unsafe_no_drop_flag shenanigans anymore.
13241324
if self.buf.unsafe_no_drop_flag_needs_drop() {
1325-
if unsafe { needs_drop::<T>() } {
1326-
for x in self.iter_mut() {
1327-
unsafe { drop_in_place(x); }
1325+
unsafe {
1326+
if needs_drop::<T>() {
1327+
for x in self.iter_mut() {
1328+
drop_in_place(x);
1329+
}
13281330
}
13291331
}
13301332
}

0 commit comments

Comments
 (0)