diff options
| author | bors <bors@rust-lang.org> | 2018-09-27 23:46:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-27 23:46:21 +0000 |
| commit | 7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8 (patch) | |
| tree | bfe627dfa7d7ea762d9a4fb1ea238539eb798934 /src/test/run-pass/array-slice-vec/nested-vec-3.rs | |
| parent | 8876906867b2db3c7177d69dd020c40d89177f86 (diff) | |
| parent | 649b20eca9a5d2860eb46f6b9e1d99753d4515b7 (diff) | |
| download | rust-7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8.tar.gz rust-7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8.zip | |
Auto merge of #54530 - pnkfelix:issue-54047-migrate-ui-run-pass-back-to-run-pass, r=alexcrichton
Migrate `src/test/ui/run-pass/*` back to `src/test/run-pass/`. Moves all the tests from `src/test/ui/run-pass/**` back to `src/test/run-pass/`. This should have no impact on our overall testing completeness due to PR #54223 Fix #54047
Diffstat (limited to 'src/test/run-pass/array-slice-vec/nested-vec-3.rs')
| -rw-r--r-- | src/test/run-pass/array-slice-vec/nested-vec-3.rs | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/src/test/run-pass/array-slice-vec/nested-vec-3.rs b/src/test/run-pass/array-slice-vec/nested-vec-3.rs new file mode 100644 index 00000000000..dc3146a2b35 --- /dev/null +++ b/src/test/run-pass/array-slice-vec/nested-vec-3.rs @@ -0,0 +1,64 @@ +// 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. + +// run-pass +#![allow(overflowing_literals)] + +// ignore-emscripten no threads support + +// Test that using the `vec!` macro nested within itself works when +// the contents implement Drop and we hit a panic in the middle of +// construction. + +use std::thread; +use std::sync::atomic::{AtomicUsize, Ordering}; + +static LOG: AtomicUsize = AtomicUsize::new(0); + +struct D(u8); + +impl Drop for D { + fn drop(&mut self) { + println!("Dropping {}", self.0); + let old = LOG.load(Ordering::SeqCst); + LOG.compare_and_swap(old, old << 4 | self.0 as usize, Ordering::SeqCst); + } +} + +fn main() { + fn die() -> D { panic!("Oh no"); } + let g = thread::spawn(|| { + let _nested = vec![vec![D( 1), D( 2), D( 3), D( 4)], + vec![D( 5), D( 6), D( 7), D( 8)], + vec![D( 9), D(10), die(), D(12)], + vec![D(13), D(14), D(15), D(16)]]; + }); + assert!(g.join().is_err()); + + // When the panic occurs, we will be in the midst of constructing the + // second inner vector. Therefore, we drop the elements of the + // partially filled vector first, before we get around to dropping + // the elements of the filled vector. + + // Issue 23222: The order in which the elements actually get + // dropped is a little funky: as noted above, we'll drop the 9+10 + // first, but due to #23222, they get dropped in reverse + // order. Likewise, again due to #23222, we will drop the second + // filled vec before the first filled vec. + // + // If Issue 23222 is "fixed", then presumably the corrected + // expected order of events will be 0x__9_A__1_2_3_4__5_6_7_8; + // that is, we would still drop 9+10 first, since they belong to + // the more deeply nested expression when the panic occurs. + + let expect = 0x__A_9__5_6_7_8__1_2_3_4; + let actual = LOG.load(Ordering::SeqCst); + assert!(actual == expect, "expect: 0x{:x} actual: 0x{:x}", expect, actual); +} |
