Navigation Menu

Skip to content

Commit

Permalink
Add dropck unsafe escape hatch (UGEH) to vec::IntoIter.
Browse files Browse the repository at this point in the history
Fix #29166
  • Loading branch information
pnkfelix committed Oct 20, 2015
1 parent 3e268f2 commit 2b712c7
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libcollections/vec.rs
Expand Up @@ -1577,6 +1577,7 @@ impl<T> ExactSizeIterator for IntoIter<T> {}

#[stable(feature = "rust1", since = "1.0.0")]
impl<T> Drop for IntoIter<T> {
#[unsafe_destructor_blind_to_params]
fn drop(&mut self) {
// destroy the remaining elements
for _x in self {}
Expand Down
30 changes: 30 additions & 0 deletions src/test/run-pass/issue-29166.rs
@@ -0,0 +1,30 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// This test ensures that vec.into_iter does not overconstrain element lifetime.

pub fn main() {
original_report();
revision_1();
revision_2();
}

fn original_report() {
drop(vec![&()].into_iter())
}

fn revision_1() {
// below is what above `vec!` expands into at time of this writing.
drop(<[_]>::into_vec(::std::boxed::Box::new([&()])).into_iter())
}

fn revision_2() {
drop((match (Vec::new(), &()) { (mut v, b) => { v.push(b); v } }).into_iter())
}

0 comments on commit 2b712c7

Please sign in to comment.