mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-27 09:14:20 +00:00
Regression tests for issues uncovered only post the run-pass and compile-fail tests.
(I.e. the idea being, lets catch errors in these basic constructs sometime *before* we start doing the doc tests.)
This commit is contained in:
parent
3902190ac4
commit
7c671e5177
52
src/test/run-pass/box-of-array-of-drop-1.rs
Normal file
52
src/test/run-pass/box-of-array-of-drop-1.rs
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// Test that we cleanup a fixed size Box<[D; k]> properly when D has a
|
||||||
|
// destructor.
|
||||||
|
|
||||||
|
use std::thread;
|
||||||
|
use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
|
||||||
|
|
||||||
|
static LOG: AtomicUsize = ATOMIC_USIZE_INIT;
|
||||||
|
|
||||||
|
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 _b1: Box<[D; 4]> = Box::new([D( 1), D( 2), D( 3), D( 4)]);
|
||||||
|
let _b2: Box<[D; 4]> = Box::new([D( 5), D( 6), D( 7), D( 8)]);
|
||||||
|
let _b3: Box<[D; 4]> = Box::new([D( 9), D(10), die(), D(12)]);
|
||||||
|
let _b4: Box<[D; 4]> = Box::new([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 input to `_b3`. Therefore, we drop the elements of the
|
||||||
|
// partially filled array first, before we get around to dropping
|
||||||
|
// the elements of `_b1` and _b2`.
|
||||||
|
|
||||||
|
// Issue 23222: The order in which the elements actually get
|
||||||
|
// dropped is a little funky. See similar notes in nested-vec-3;
|
||||||
|
// in essence, I would not be surprised if we change the ordering
|
||||||
|
// given in `expect` in the future.
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
52
src/test/run-pass/box-of-array-of-drop-2.rs
Normal file
52
src/test/run-pass/box-of-array-of-drop-2.rs
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// Test that we cleanup dynamic sized Box<[D]> properly when D has a
|
||||||
|
// destructor.
|
||||||
|
|
||||||
|
use std::thread;
|
||||||
|
use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
|
||||||
|
|
||||||
|
static LOG: AtomicUsize = ATOMIC_USIZE_INIT;
|
||||||
|
|
||||||
|
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 _b1: Box<[D; 4]> = Box::new([D( 1), D( 2), D( 3), D( 4)]);
|
||||||
|
let _b2: Box<[D; 4]> = Box::new([D( 5), D( 6), D( 7), D( 8)]);
|
||||||
|
let _b3: Box<[D; 4]> = Box::new([D( 9), D(10), die(), D(12)]);
|
||||||
|
let _b4: Box<[D; 4]> = Box::new([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 input to `_b3`. Therefore, we drop the elements of the
|
||||||
|
// partially filled array first, before we get around to dropping
|
||||||
|
// the elements of `_b1` and _b2`.
|
||||||
|
|
||||||
|
// Issue 23222: The order in which the elements actually get
|
||||||
|
// dropped is a little funky. See similar notes in nested-vec-3;
|
||||||
|
// in essence, I would not be surprised if we change the ordering
|
||||||
|
// given in `expect` in the future.
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
16
src/test/run-pass/nested-vec-1.rs
Normal file
16
src/test/run-pass/nested-vec-1.rs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// Test that using the `vec!` macro nested within itself works
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let nested = vec![vec![1u32, 2u32, 3u32]];
|
||||||
|
assert_eq!(nested[0][1], 2);
|
||||||
|
}
|
23
src/test/run-pass/nested-vec-2.rs
Normal file
23
src/test/run-pass/nested-vec-2.rs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// Test that using the `vec!` macro nested within itself works
|
||||||
|
// when the contents implement Drop
|
||||||
|
|
||||||
|
struct D(u32);
|
||||||
|
|
||||||
|
impl Drop for D {
|
||||||
|
fn drop(&mut self) { println!("Dropping {}", self.0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let nested = vec![vec![D(1u32), D(2u32), D(3u32)]];
|
||||||
|
assert_eq!(nested[0][1].0, 2);
|
||||||
|
}
|
60
src/test/run-pass/nested-vec-3.rs
Normal file
60
src/test/run-pass/nested-vec-3.rs
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
// 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, ATOMIC_USIZE_INIT, Ordering};
|
||||||
|
|
||||||
|
static LOG: AtomicUsize = ATOMIC_USIZE_INIT;
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user