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/libstd/lib.rs | |
| parent | a79e5e210e5e20077b2a5cf6c0c8d2bdc11e6066 (diff) | |
| parent | 10f7c110928ee7d3db7fef15fd7dce776b17e161 (diff) | |
| download | rust-b52b33a38626306ec2f622f101e7edc2964abfe4.tar.gz rust-b52b33a38626306ec2f622f101e7edc2964abfe4.zip | |
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/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 854cefcb597..d7d856fe3ad 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -500,11 +500,6 @@ mod memchr; // The runtime entry point and a few unstable public functions used by the // compiler pub mod rt; -// The trait to support returning arbitrary types in the main function -mod termination; - -#[unstable(feature = "termination_trait", issue = "43301")] -pub use self::termination::Termination; // Include a number of private modules that exist solely to provide // the rustdoc documentation for primitive types. Using `include!` |