diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-28 13:00:07 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-28 16:57:36 -0700 |
| commit | 8766c2e35b6454ff51ab3deab3cd334ebd033da1 (patch) | |
| tree | f5f6d0c3a53908a8d91f7b1ab47f5bd35d729d69 /src/libcore/task | |
| parent | 517206fd0876c17d5e1540ea5c544a51adf086de (diff) | |
| download | rust-8766c2e35b6454ff51ab3deab3cd334ebd033da1.tar.gz rust-8766c2e35b6454ff51ab3deab3cd334ebd033da1.zip | |
core: Demode patterns
Diffstat (limited to 'src/libcore/task')
| -rw-r--r-- | src/libcore/task/local_data.rs | 4 | ||||
| -rw-r--r-- | src/libcore/task/spawn.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/task/local_data.rs b/src/libcore/task/local_data.rs index 313ad16fa0f..eda76518001 100644 --- a/src/libcore/task/local_data.rs +++ b/src/libcore/task/local_data.rs @@ -115,14 +115,14 @@ pub fn test_tls_modify() unsafe { fn my_key(+_x: @~str) { } local_data_modify(my_key, |data| { match data { - Some(@val) => fail ~"unwelcome value: " + val, + Some(@ref val) => fail ~"unwelcome value: " + *val, None => Some(@~"first data") } }); local_data_modify(my_key, |data| { match data { Some(@~"first data") => Some(@~"next data"), - Some(@val) => fail ~"wrong value: " + val, + Some(@ref val) => fail ~"wrong value: " + *val, None => fail ~"missing value" } }); diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs index 45e0d0f1a0d..33e711ce9ac 100644 --- a/src/libcore/task/spawn.rs +++ b/src/libcore/task/spawn.rs @@ -451,7 +451,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool) // it should be enabled only in debug builds. let new_generation = match *old_ancestors { - Some(arc) => access_ancestors(&arc, |a| a.generation+1), + Some(ref arc) => access_ancestors(arc, |a| a.generation+1), None => 0 // the actual value doesn't really matter. }; assert new_generation < uint::max_value; @@ -541,8 +541,8 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) { //let mut notifier = None;//notify_chan.map(|c| AutoNotify(c)); let notifier = match notify_chan { - Some(notify_chan_value) => { - let moved_ncv = move_it!(notify_chan_value); + Some(ref notify_chan_value) => { + let moved_ncv = move_it!(*notify_chan_value); Some(AutoNotify(move moved_ncv)) } _ => None |