]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #48143 - nikomatsakis:termination_trait_in_tests, r=eddyb
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 24 Feb 2018 16:55:41 +0000 (08:55 -0800)
committerManish Goregaokar <manishsmail@gmail.com>
Sat, 24 Feb 2018 20:47:58 +0000 (12:47 -0800)
Termination trait in tests

Support the `Termination` trait in unit tests (cc https://github.com/rust-lang/rust/issues/43301)

Also, a drive-by fix for #47075.

This is joint work with @bkchr.

1  2 
src/librustc_driver/driver.rs
src/libstd/lib.rs
src/libsyntax/ext/build.rs
src/libsyntax/test.rs

Simple merge
Simple merge
Simple merge
Simple merge