diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-14 11:03:34 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-15 23:30:24 -0700 |
| commit | 89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745 (patch) | |
| tree | 842308cfd38935989d625db41ffdd22758f8acdb /src/libtest | |
| parent | 6d8342f5e9f7093694548e761ee7df4f55243f3f (diff) | |
| download | rust-89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745.tar.gz rust-89b0e6e12ba2fb24ec0e6655a1130c16eb8d1745.zip | |
Register new snapshots
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 9108a2c9459..e7c35fb59ee 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -346,16 +346,16 @@ environment variable. Logging is not captured by default. Test Attributes: - \#[test] - Indicates a function is a test to be run. This function + #[test] - Indicates a function is a test to be run. This function takes no arguments. - \#[bench] - Indicates a function is a benchmark to be run. This + #[bench] - Indicates a function is a benchmark to be run. This function takes one argument (test::Bencher). - \#[should_fail] - This function (also labeled with \#[test]) will only pass if + #[should_fail] - This function (also labeled with #[test]) will only pass if the code causes a failure (an assertion failure or fail!) - \#[ignore] - When applied to a function which is already attributed as a + #[ignore] - When applied to a function which is already attributed as a test, then the test runner will ignore these tests during normal test runs. Running with --ignored will run these - tests. This may also be written as \#[ignore(cfg(...))] to + tests. This may also be written as #[ignore(cfg(...))] to ignore the test on certain configurations.", usage = getopts::usage(message.as_slice(), optgroups().as_slice())); @@ -473,7 +473,7 @@ pub enum TestResult { } enum OutputLocation<T> { - Pretty(Box<term::Terminal<Box<Writer:Send>>:Send>), + Pretty(Box<term::Terminal<Box<Writer + Send>> + Send>), Raw(T), } @@ -1049,8 +1049,8 @@ pub fn run_test(opts: &TestOpts, if nocapture { drop((stdout, stderr)); } else { - task.opts.stdout = Some(box stdout as Box<Writer:Send>); - task.opts.stderr = Some(box stderr as Box<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); |
