diff options
| author | bors <bors@rust-lang.org> | 2014-05-07 05:16:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-07 05:16:48 -0700 |
| commit | ef6daf9935da103f1b915a5c9904794da79b0b60 (patch) | |
| tree | ad9695f06d85962039a8f90ac741726b345096aa /src/libtest | |
| parent | 4a5d39001b1da84fe4be2996a2c7d894d5c248c6 (diff) | |
| parent | 090040bf4037a094e50b03d79e4baf5cd89c912b (diff) | |
| download | rust-ef6daf9935da103f1b915a5c9904794da79b0b60.tar.gz rust-ef6daf9935da103f1b915a5c9904794da79b0b60.zip | |
auto merge of #13958 : pcwalton/rust/detilde, r=pcwalton
for `~str`/`~[]`. Note that `~self` still remains, since I forgot to add support for `Box<self>` before the snapshot. r? @brson or @alexcrichton or whoever
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index fa55444fe5b..4040e079224 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -132,7 +132,7 @@ pub enum TestFn { StaticMetricFn(proc(&mut MetricMap)), DynTestFn(proc():Send), DynMetricFn(proc(&mut MetricMap)), - DynBenchFn(~TDynBenchFn) + DynBenchFn(Box<TDynBenchFn>) } impl TestFn { @@ -1001,8 +1001,8 @@ pub fn run_test(opts: &TestOpts, if nocapture { drop((stdout, stderr)); } else { - task.opts.stdout = Some(box stdout as ~Writer:Send); - task.opts.stderr = Some(box stderr as ~Writer:Send); + task.opts.stdout = Some(box stdout as Box<Writer:Send>); + task.opts.stderr = Some(box stderr as Box<Writer:Send>); } let result_future = task.future_result(); task.spawn(testfn); |
