diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-25 01:26:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 01:26:32 +0800 |
| commit | 8d57071cbbdf3a5e7006cae303d6d14c905c8fc0 (patch) | |
| tree | 229615e8e20c9c83ea7588b1edfbd374273d867b /src/libstd/lib.rs | |
| parent | c892e683872725b9d9b4ed0ed5bd53281313bc38 (diff) | |
| parent | 2b13d95da02d318c12814261dd36edd91ae6879e (diff) | |
| download | rust-8d57071cbbdf3a5e7006cae303d6d14c905c8fc0.tar.gz rust-8d57071cbbdf3a5e7006cae303d6d14c905c8fc0.zip | |
Rollup merge of #49162 - tmandry:stabilize-termination-trait, r=nikomatsakis
Stabilize termination_trait, split out termination_trait_test For #48453. First time contribution, so I'd really appreciate any feedback on how this PR can be better. Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 36eb7291822..0b06c5d4d65 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -308,7 +308,6 @@ #![feature(str_char)] #![feature(str_internals)] #![feature(str_utf16)] -#![feature(termination_trait)] #![feature(test, rustc_private)] #![feature(thread_local)] #![feature(toowned_clone_into)] @@ -325,6 +324,7 @@ #![cfg_attr(test, feature(update_panic_count))] #![cfg_attr(windows, feature(used))] #![cfg_attr(stage0, feature(never_type))] +#![cfg_attr(stage0, feature(termination_trait))] #![default_lib_allocator] |