diff options
| author | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-03-16 23:40:43 +0100 |
|---|---|---|
| committer | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-03-16 23:40:43 +0100 |
| commit | 60f1644fd2746fd29520099d1667b6c3a3eb7b83 (patch) | |
| tree | 1bb0bf5adc583c13833e1cafd65954c6ab5c0f5d /src/libstd/lib.rs | |
| parent | eeb5f171da2486c34e4e473c97a1468279d05e7c (diff) | |
| parent | 2c8bbf50db0ef90a33f986ba8fc2e1fe129197ff (diff) | |
| download | rust-60f1644fd2746fd29520099d1667b6c3a3eb7b83.tar.gz rust-60f1644fd2746fd29520099d1667b6c3a3eb7b83.zip | |
Merge remote-tracking branch 'upstream/master' into asm-compile-tests
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e31680f23f1..fc8ac9a0b3e 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -221,7 +221,7 @@ #![cfg_attr(test, feature(print_internals, set_stdio, test, update_panic_count))] #![cfg_attr(all(target_vendor = "fortanix", target_env = "sgx"), - feature(global_asm, range_contains, slice_index_methods, + feature(global_asm, slice_index_methods, decl_macro, coerce_unsized, sgx_platform, ptr_wrapping_offset_from))] // std is implemented with unstable features, many of which are internal @@ -245,6 +245,7 @@ #![feature(cfg_target_thread_local)] #![feature(char_error_internals)] #![feature(checked_duration_since)] +#![feature(clamp)] #![feature(compiler_builtins_lib)] #![feature(concat_idents)] #![feature(const_cstr_unchecked)] |