diff options
| author | bors <bors@rust-lang.org> | 2021-12-13 20:12:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-13 20:12:35 +0000 |
| commit | 8f117a77d0880ed59afcc1a19c72ec5c1e44b97c (patch) | |
| tree | c1df0a20824dcb0936f0a52051c2129e2d0e96c6 /library/std/src | |
| parent | 1796de7bb123df3f3d32124ededf1344434f672e (diff) | |
| parent | ff214b745de20917b398510e78e7aba5afba9a72 (diff) | |
| download | rust-8f117a77d0880ed59afcc1a19c72ec5c1e44b97c.tar.gz rust-8f117a77d0880ed59afcc1a19c72ec5c1e44b97c.zip | |
Auto merge of #91865 - matthiaskrgr:rollup-rai9ecq, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #91699 (Add `-webkit-appearance: none` to search input) - #91846 (rustdoc: Reduce number of arguments for `run_test` a bit) - #91847 (Fix FIXME for `generic_arg_infer` in `create_substs_for_ast_path`) - #91849 (GATs outlives lint: Try to prove bounds) - #91855 (Stabilize const_cstr_unchecked) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/ffi/c_str.rs | 2 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/library/std/src/ffi/c_str.rs b/library/std/src/ffi/c_str.rs index 465bbae8631..9c1b79d6966 100644 --- a/library/std/src/ffi/c_str.rs +++ b/library/std/src/ffi/c_str.rs @@ -1259,7 +1259,7 @@ impl CStr { #[inline] #[must_use] #[stable(feature = "cstr_from_bytes", since = "1.10.0")] - #[rustc_const_unstable(feature = "const_cstr_unchecked", issue = "90343")] + #[rustc_const_stable(feature = "const_cstr_unchecked", since = "1.59.0")] pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr { // SAFETY: Casting to CStr is safe because its internal representation // is a [u8] too (safe only inside std). diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index d4ff642cd13..dabab667ee9 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -252,7 +252,6 @@ #![feature(char_internals)] #![cfg_attr(not(bootstrap), feature(concat_bytes))] #![feature(concat_idents)] -#![feature(const_cstr_unchecked)] #![feature(const_fn_floating_point_arithmetic)] #![feature(const_fn_fn_ptr_basics)] #![feature(const_fn_trait_bound)] |