diff options
| author | bors <bors@rust-lang.org> | 2014-06-28 20:11:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-28 20:11:34 +0000 |
| commit | fe8bc178014dc2c5badd8443329c179478a40cc4 (patch) | |
| tree | b5bfc8f15cc996fe751306924595f81bcc558a27 /src/libstd/task.rs | |
| parent | de337f3ddfbef800a8cf731e0b593e341af1e3e5 (diff) | |
| parent | 0dfc90ab15475aa64bea393671463a8e9784ae3f (diff) | |
| download | rust-fe8bc178014dc2c5badd8443329c179478a40cc4.tar.gz rust-fe8bc178014dc2c5badd8443329c179478a40cc4.zip | |
auto merge of #15208 : alexcrichton/rust/snapshots, r=pcwalton
This change registers new snapshots, allowing `*T` to be removed from the language. This is a large breaking change, and it is recommended that if compiler errors are seen that any FFI calls are audited to determine whether they should be actually taking `*mut T`.
Diffstat (limited to 'src/libstd/task.rs')
| -rw-r--r-- | src/libstd/task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/task.rs b/src/libstd/task.rs index 8ccded6681b..21d19deb0c7 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -511,10 +511,10 @@ mod test { let (tx, rx) = channel::<uint>(); let x = box 1; - let x_in_parent = (&*x) as *int as uint; + let x_in_parent = (&*x) as *const int as uint; spawnfn(proc() { - let x_in_child = (&*x) as *int as uint; + let x_in_child = (&*x) as *const int as uint; tx.send(x_in_child); }); |
