diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-24 08:55:41 -0800 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-24 12:47:58 -0800 |
| commit | b52b33a38626306ec2f622f101e7edc2964abfe4 (patch) | |
| tree | 4b27672436eb209ea15241c131367efa67881eb1 /src/librustc_driver | |
| parent | a79e5e210e5e20077b2a5cf6c0c8d2bdc11e6066 (diff) | |
| parent | 10f7c110928ee7d3db7fef15fd7dce776b17e161 (diff) | |
Rollup merge of #48143 - nikomatsakis:termination_trait_in_tests, r=eddyb
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.
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/driver.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index c918f7ac62e..40dd557b7da 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -818,7 +818,8 @@ pub fn phase_2_configure_and_expand_inner<'a, F>(sess: &'a Session, &mut resolver, sess.opts.test, krate, - sess.diagnostic()) + sess.diagnostic(), + &sess.features.borrow()) }); // If we're actually rustdoc then there's no need to actually compile |