diff options
| author | bors <bors@rust-lang.org> | 2015-02-24 09:33:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-24 09:33:17 +0000 |
| commit | dccdde4007c191aa8b8d9cfffb0c7d3509fa675e (patch) | |
| tree | f4493e88a229c9622daf5389616001fd48d337c2 /src/libstd/sync/task_pool.rs | |
| parent | 0ef56da541a90c62801440702a3e3c009e5332be (diff) | |
| parent | b182cd7245a999ac702f88c89dcc28811d6fdf8a (diff) | |
| download | rust-dccdde4007c191aa8b8d9cfffb0c7d3509fa675e.tar.gz rust-dccdde4007c191aa8b8d9cfffb0c7d3509fa675e.zip | |
Auto merge of #22755 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/libstd/sync/task_pool.rs')
| -rw-r--r-- | src/libstd/sync/task_pool.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/task_pool.rs b/src/libstd/sync/task_pool.rs index a45048be24c..31f3dfd877c 100644 --- a/src/libstd/sync/task_pool.rs +++ b/src/libstd/sync/task_pool.rs @@ -89,7 +89,7 @@ impl TaskPool { /// # Panics /// /// This function will panic if `threads` is 0. - pub fn new(threads: uint) -> TaskPool { + pub fn new(threads: usize) -> TaskPool { assert!(threads >= 1); let (tx, rx) = channel::<Thunk>(); @@ -142,7 +142,7 @@ mod test { use super::*; use sync::mpsc::channel; - const TEST_TASKS: uint = 4; + const TEST_TASKS: usize = 4; #[test] fn test_works() { |