diff options
| author | Ben Blum <bblum@andrew.cmu.edu> | 2013-06-21 18:52:53 -0400 |
|---|---|---|
| committer | Ben Blum <bblum@andrew.cmu.edu> | 2013-06-29 03:58:50 -0400 |
| commit | 5784c0912f99a4bfeb75909fab0cf9bb6bef794f (patch) | |
| tree | cd2f4c1156822c7b4a9589f5ed3a60b549b30128 | |
| parent | 4e78c1e2a89f65a1827e1f65afc741cee05cee0a (diff) | |
| download | rust-5784c0912f99a4bfeb75909fab0cf9bb6bef794f.tar.gz rust-5784c0912f99a4bfeb75909fab0cf9bb6bef794f.zip | |
Change taskgroup key type to fn:Copy in prep for noncopyable stack closures.
| -rw-r--r-- | src/libextra/sort.rs | 2 | ||||
| -rw-r--r-- | src/libstd/local_data.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ast_util.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libextra/sort.rs b/src/libextra/sort.rs index 5377dfadbaa..6befd49e8af 100644 --- a/src/libextra/sort.rs +++ b/src/libextra/sort.rs @@ -1202,7 +1202,7 @@ mod big_tests { struct LVal<'self> { val: uint, - key: &'self fn(@uint), + key: &'self fn:Copy(@uint), } #[unsafe_destructor] diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index 33b4e3f1963..c5f2c8ae584 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -46,7 +46,7 @@ use task::local_data_priv::{local_get, local_pop, local_modify, local_set, Handl * * These two cases aside, the interface is safe. */ -pub type LocalDataKey<'self,T> = &'self fn(v: @T); +pub type LocalDataKey<'self,T> = &'self fn:Copy(v: @T); /** * Remove a task-local data value from the table, returning the diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 6761736d2f3..7ea19611b51 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -704,7 +704,7 @@ pub fn new_sctable_internal() -> SCTable { pub fn get_sctable() -> @mut SCTable { unsafe { let sctable_key = (cast::transmute::<(uint, uint), - &fn(v: @@mut SCTable)>( + &fn:Copy(v: @@mut SCTable)>( (-4 as uint, 0u))); match local_data::local_data_get(sctable_key) { None => { diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 793626f0e18..c98062cf3bd 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -484,7 +484,7 @@ pub fn get_ident_interner() -> @ident_interner { unsafe { let key = (cast::transmute::<(uint, uint), - &fn(v: @@::parse::token::ident_interner)>( + &fn:Copy(v: @@::parse::token::ident_interner)>( (-3 as uint, 0u))); match local_data::local_data_get(key) { Some(interner) => *interner, |