Termination trait in tests #48143

nikomatsakis · 2018-02-11T14:39:15Z

Support the Termination trait in unit tests (cc #43301)

Also, a drive-by fix for #47075.

This is joint work with @bkchr.

rust-highfive · 2018-02-11T14:39:26Z

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

nikomatsakis · 2018-02-11T14:39:28Z

r? @petrochenkov

eddyb · 2018-02-11T15:14:38Z

src/libsyntax/test.rs

+            ecx.lambda(
+                span,
+                vec![],
+                // ::std::Termination::assert_unit_test_successful(..)


Can't this function be in libtest? I do think I like the closure though - it gets coerced into a fn pointer, right?

Can you say more about what you think I should do here? You want me to generate a closure that invokes a fn in libtest that invokes std::Termination::assert_unit_test_successful? (Or I guess potentially remove assert_unit_test_successful? I'd rather not do the latter, but then it is an ad-hoc extension to the spec. It's one that makes a lot of sense to me though, since I imagine that people may want to write custom result types that print out differently in unit test failures than otherwise. But I guess there is no strong reason that said people shouldn't use a different type in their unit tests.)

I think there should be a trait in libtest that can be specialized if need be in the future.

ok, so roughly what there is no, but indirecting through some random trait instead, and that trait is implemented for all T: Termination?

That sounds like a good default, yes. I'd really want to keep testing infrastructure out of libstd where possible.

@eddyb I guess it'd be mildly easier (and equally future proof) to add a top-level function to libtest, like assert_unit_test_success(foo()). Internally, it can use Termination for now -- we can just use it indiscriminately actually, since Termination is defined for ().

But ok, I'll add something like that.

bkchr · 2018-02-11T20:37:31Z

src/libsyntax/lib.rs

@@ -105,6 +105,7 @@ pub mod syntax {
    pub use ext;
    pub use parse;
    pub use ast;
+    pub use tokenstream;


I think that is not required anymore, as you don't use the quote! anymore.

Do you still need to remove this?

matklad · 2018-02-12T07:40:07Z

cc @Manishearth and custom test frameworks just in case.

Manishearth · 2018-02-12T07:48:46Z

Hmm, this is another example of something that needs compile-time expansion tweaking to work.

arielb1 · 2018-02-12T08:09:34Z

src/libsyntax/test.rs

+    // like this:
+    //
+    //     fn wrapper() {
+    //         assert_eq!(0, real_function().report());


sure you mean Termination::assert_unit_test_successful(real_function())?

yeah that comment is dated I guess

petrochenkov · 2018-02-12T16:04:35Z

Reviewed. Everything looks reasonable, modulo things already mentioned by other people.
There's a bunch of failing tests in libstd though.

nikomatsakis · 2018-02-14T15:07:14Z

@eddyb so I tried to do what you suggested (see most recent commit) but now I get these errors from libtest:

Building stage0 test artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compiling term v0.0.0 (file:///home/nmatsakis/versioned/rust-4/src/libterm)
   Compiling getopts v0.2.15
   Compiling test v0.0.0 (file:///home/nmatsakis/versioned/rust-4/src/libtest)
error: use of unstable library feature 'termination_trait' (see issue #43301)
  --> libtest/lib.rs:73:5
   |
73 | use std::Termination;
   |     ^^^^^^^^^^^^^^^^
   |
   = help: add #![feature(termination_trait)] to the crate attributes to enable

error: use of unstable library feature 'termination_trait' (see issue #43301)
   --> libtest/lib.rs:327:30
    |
327 | pub fn assert_test_result<T: Termination>(result: T) {
    |                              ^^^^^^^^^^^
    |
    = help: add #![feature(termination_trait)] to the crate attributes to enable

error: use of unstable library feature 'termination_trait' (see issue #43301)
   --> libtest/lib.rs:328:5
    |
328 |     Termination::assert_unit_test_successful(result)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add #![feature(termination_trait)] to the crate attributes to enable

This despite the fact that we have the feature gate enabled. I'm not really sure what's going on there...

nikomatsakis · 2018-02-21T21:05:28Z

OK, so, I'm inclined to revert back to my working version and file a FIXME to extract this logic into libtest. I don't really feel like taking the time to root out this problem, and the amount of logic in question here is quite small.

@eddyb @petrochenkov -- any objection?

Extend `Termination` trait with a method to determine what happens with a unit test. This commit incorporates work by Bastian Köcher <git@kchr.de>.

nikomatsakis · 2018-02-22T22:56:03Z

r? @eddyb

Also make `std::termination` module public and rename feature. The lib feature needs a different name from the language feature.

src/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs

eddyb · 2018-02-23T01:42:31Z

@bors r+

bors · 2018-02-23T01:42:32Z

📌 Commit 0a5f4ae has been approved by eddyb

kennytm · 2018-02-23T02:48:40Z

@bors r-

The test compile-fail/issue-12997-2.rs failed.

[01:07:29] ---- [compile-fail] compile-fail/issue-12997-2.rs stdout ----
[01:07:29] 	
[01:07:29] error: /checkout/src/test/compile-fail/issue-12997-2.rs:16: expected message not found: expected type `for<'r> fn(&'r mut __test::test::Bencher)`
[01:07:29] 
[01:07:29] error: /checkout/src/test/compile-fail/issue-12997-2.rs:16: expected message not found: found type `fn(isize) {bar}`
[01:07:29] 
[01:07:29] error: /checkout/src/test/compile-fail/issue-12997-2.rs:16: expected message not found: expected mutable reference, found isize
[01:07:29] 
[01:07:29] error: 0 unexpected errors found, 3 expected errors not found
[01:07:29] status: exit code: 101
[01:07:29] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/compile-fail/issue-12997-2.rs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/issue-12997-2.stage2-x86_64-unknown-linux-gnu" "-Crpath" "-O" "-Zmiri" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/issue-12997-2.stage2-x86_64-unknown-linux-gnu.aux" "-A" "unused"
[01:07:29] not found errors (from test file): [
[01:07:29]     Error {
[01:07:29]         line_num: 16,
[01:07:29]         kind: None,
[01:07:29]         msg: "expected type `for<\'r> fn(&\'r mut __test::test::Bencher)`"
[01:07:29]     },
[01:07:29]     Error {
[01:07:29]         line_num: 16,
[01:07:29]         kind: None,
[01:07:29]         msg: "found type `fn(isize) {bar}`"
[01:07:29]     },
[01:07:29]     Error {
[01:07:29]         line_num: 16,
[01:07:29]         kind: None,
[01:07:29]         msg: "expected mutable reference, found isize"
[01:07:29]     }
[01:07:29] ]
[01:07:29] 
[01:07:29] thread '[compile-fail] compile-fail/issue-12997-2.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:1253:13
[01:07:29] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:07:29] 
[01:07:29] 
[01:07:29] failures:
[01:07:29]     [compile-fail] compile-fail/issue-12997-2.rs
[01:07:29] 
[01:07:29] test result: FAILED. 2303 passed; 1 failed; 15 ignored; 0 measured; 0 filtered out
[01:07:29] 
[01:07:29] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:476:22

nikomatsakis · 2018-02-23T20:46:55Z

@bors r=eddyb

bors · 2018-02-23T20:46:56Z

📌 Commit 10f7c11 has been approved by eddyb

@bkchr

…ests, r=eddyb Termination trait in tests Support the `Termination` trait in unit tests (cc rust-lang#43301) Also, a drive-by fix for rust-lang#47075. This is joint work with @bkchr.

Rollup of 15 pull requests - Successful merges: #47987, #48056, #48061, #48084, #48143, #48185, #48206, #48208, #48232, #48246, #48258, #48317, #48353, #48356, #48402 - Failed merges:

@bkchr

…ests, r=eddyb Termination trait in tests Support the `Termination` trait in unit tests (cc rust-lang#43301) Also, a drive-by fix for rust-lang#47075. This is joint work with @bkchr.

Rollup of 15 pull requests - Successful merges: #47987, #48056, #48061, #48084, #48143, #48185, #48206, #48208, #48232, #48246, #48258, #48317, #48353, #48356, #48402 - Failed merges:

rust-highfive assigned pnkfelix Feb 11, 2018

rust-highfive assigned petrochenkov and unassigned pnkfelix Feb 11, 2018

nikomatsakis mentioned this pull request Feb 11, 2018

Tracking issue for RFC 1937: ? in main #43301

Closed

12 tasks

eddyb reviewed Feb 11, 2018

View reviewed changes

pietroalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 11, 2018

bkchr reviewed Feb 11, 2018

View reviewed changes

arielb1 reviewed Feb 12, 2018

View reviewed changes

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2018

nikomatsakis added 2 commits February 22, 2018 17:31

support unit tests with return values that implement Terminaton

1eab1b1

Extend `Termination` trait with a method to determine what happens with a unit test. This commit incorporates work by Bastian Köcher <git@kchr.de>.

begin crate-relative paths with crate

0625d4c

nikomatsakis force-pushed the termination_trait_in_tests branch from 0ceff7b to 2029084 Compare February 22, 2018 22:55

rust-highfive assigned eddyb and unassigned petrochenkov Feb 22, 2018

nikomatsakis added 2 commits February 22, 2018 17:56

put the "unit test" logic into libtest

e446f70

Also make `std::termination` module public and rename feature. The lib feature needs a different name from the language feature.

move Termination trait to std::process

5f1e78f

nikomatsakis force-pushed the termination_trait_in_tests branch from 2029084 to 5f1e78f Compare February 22, 2018 22:57

nikomatsakis added 4 commits February 22, 2018 18:26

remove tokenstream

8f35141

handle #[bench] functions better

067c2e3

add test for fn main() -> !

e0ed88d

delete this test file: it also appears as

a0562ec

src/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs

move test to the proper directory and test #[bench]

0a5f4ae

nikomatsakis mentioned this pull request Feb 23, 2018

Stabilize main with non-() return types #48453

Closed

2 tasks

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 23, 2018

nikomatsakis added 2 commits February 23, 2018 07:34

update test -- we now give a slightly different error

068e383

re-export assert_test_result for use when testing libtest itself

10f7c11

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2018

Manishearth mentioned this pull request Feb 24, 2018

Rollup of 15 pull requests #48510

Merged

bors merged commit 10f7c11 into rust-lang:master Feb 24, 2018

scottmcm mentioned this pull request Feb 25, 2018

Restrict the Termination impls to simplify stabilization #48497

Merged

This was referenced Feb 25, 2018

Add assert_test_result required by latest nightly japaric/utest#2

Merged

Fix CI for thumb* targets rust-lang/compiler-builtins#232

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Termination trait in tests #48143

Termination trait in tests #48143

nikomatsakis commented Feb 11, 2018

rust-highfive commented Feb 11, 2018

nikomatsakis commented Feb 11, 2018

eddyb Feb 11, 2018

nikomatsakis Feb 12, 2018

eddyb Feb 12, 2018

nikomatsakis Feb 12, 2018

eddyb Feb 12, 2018

nikomatsakis Feb 13, 2018

nikomatsakis Feb 13, 2018

bkchr Feb 11, 2018

nikomatsakis Feb 12, 2018

eddyb Feb 22, 2018

matklad commented Feb 12, 2018

Manishearth commented Feb 12, 2018

arielb1 Feb 12, 2018

nikomatsakis Feb 12, 2018

petrochenkov commented Feb 12, 2018

nikomatsakis commented Feb 14, 2018

nikomatsakis commented Feb 21, 2018 •

edited

Loading

nikomatsakis commented Feb 22, 2018

eddyb commented Feb 23, 2018

bors commented Feb 23, 2018

kennytm commented Feb 23, 2018

nikomatsakis commented Feb 23, 2018

bors commented Feb 23, 2018

Termination trait in tests #48143

Termination trait in tests #48143

Conversation

nikomatsakis commented Feb 11, 2018

rust-highfive commented Feb 11, 2018

nikomatsakis commented Feb 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matklad commented Feb 12, 2018

Manishearth commented Feb 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

petrochenkov commented Feb 12, 2018

nikomatsakis commented Feb 14, 2018

nikomatsakis commented Feb 21, 2018 • edited Loading

nikomatsakis commented Feb 22, 2018

eddyb commented Feb 23, 2018

bors commented Feb 23, 2018

kennytm commented Feb 23, 2018

nikomatsakis commented Feb 23, 2018

bors commented Feb 23, 2018

nikomatsakis commented Feb 21, 2018 •

edited

Loading