Skip to content

Compile with Rust 1.21 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
njaard wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compile with Rust 1.21 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3306c
compile on Rust 1.21
Nov 16, 2017
af5359a
add a test
Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![cfg_attr(test, deny(warnings))]
#![deny(missing_docs)]

//! # scoped-pool
Expand Down Expand Up @@ -322,7 +321,7 @@ impl<'scope> Scope<'scope> {
pub fn zoom<'smaller, F, R>(&self, scheduler: F) -> R
where F: FnOnce(&Scope<'smaller>) -> R,
'scope: 'smaller {
let scope = unsafe { self.refine::<'smaller>() };
let scope = unsafe { self.refine() };

// Join the scope either on completion of the scheduler or panic.
defer!(scope.join());
Expand Down Expand Up @@ -697,6 +696,22 @@ mod test {
});
}

#[test]
fn no_leak() {
let counters = ::std::sync::Arc::new(());

let mut pool = Pool::new(4);
pool.scoped(|scoped| {
let c = ::std::sync::Arc::clone(&counters);
scoped.execute(move || {
let _c = c;
::std::thread::sleep(::std::time::Duration::from_millis(100));
});
});
drop(pool);
assert_eq!(::std::sync::Arc::strong_count(&counters), 1);
}

#[test]
#[should_panic]
fn test_scheduler_panic_waits_for_tasks() {
Expand Down