Add tests for the removal of the 'static superbound from Send.
This commit is contained in:
parent
35ca50bd56
commit
22c88323f3
2 changed files with 72 additions and 0 deletions
25
src/test/compile-fail/send-is-not-static-ensures-scoping.rs
Executable file
25
src/test/compile-fail/send-is-not-static-ensures-scoping.rs
Executable file
|
@ -0,0 +1,25 @@
|
|||
// Copyright 2014 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.
|
||||
|
||||
#![feature(core, std_misc)]
|
||||
use std::thread::Thread;
|
||||
|
||||
fn main() {
|
||||
let bad = {
|
||||
let x = 1;
|
||||
let y = &x;
|
||||
|
||||
Thread::scoped(|| { //~ ERROR cannot infer an appropriate lifetime
|
||||
let _z = y;
|
||||
})
|
||||
};
|
||||
|
||||
bad.join().ok().unwrap();
|
||||
}
|
47
src/test/run-pass/send-is-not-static-par-for.rs
Executable file
47
src/test/run-pass/send-is-not-static-par-for.rs
Executable file
|
@ -0,0 +1,47 @@
|
|||
// 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.
|
||||
|
||||
#![feature(core, std_misc)]
|
||||
use std::thread::Thread;
|
||||
use std::sync::Mutex;
|
||||
|
||||
fn par_for<I, F>(iter: I, f: F)
|
||||
where I: Iterator,
|
||||
<I as Iterator>::Item: Send,
|
||||
F: Fn(<I as Iterator>::Item) + Sync
|
||||
{
|
||||
let f = &f;
|
||||
let _guards: Vec<_> = iter.map(|elem| {
|
||||
Thread::scoped(move || {
|
||||
f(elem)
|
||||
})
|
||||
}).collect();
|
||||
|
||||
}
|
||||
|
||||
fn sum(x: &[i32]) {
|
||||
let sum_lengths = Mutex::new(0);
|
||||
par_for(x.windows(4), |x| {
|
||||
*sum_lengths.lock().unwrap() += x.len()
|
||||
});
|
||||
|
||||
assert_eq!(*sum_lengths.lock().unwrap(), (x.len() - 3) * 4);
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let mut elements = [0; 20];
|
||||
|
||||
// iterators over references into this stack frame
|
||||
par_for(elements.iter_mut().enumerate(), |(i, x)| {
|
||||
*x = i as i32
|
||||
});
|
||||
|
||||
sum(&elements)
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue