Rollup merge of #103439 - Nilstrieb:help-me-with-my-macro, r=estebank

[rust.git] / library / core / src / lib.rs

diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
index 5dc7427bee003c5cca37685b594f13babb3cc5de..2d12805270f93bed274ee92d93cc32b48cf19fb5 100644 (file)
--- a/library/core/src/lib.rs
+++ b/library/core/src/lib.rs
@@ -104,7 +104,7 @@
 #![feature(const_black_box)]
 #![feature(const_caller_location)]
 #![feature(const_cell_into_inner)]
-#![feature(const_char_convert)]
+#![feature(const_char_from_u32_unchecked)]
 #![feature(const_clone)]
 #![feature(const_cmp)]
 #![feature(const_discriminant)]
@@ -185,6 +185,7 @@
 #![feature(const_refs_to_cell)]
 #![feature(decl_macro)]
 #![feature(deprecated_suggestion)]
+#![cfg_attr(not(bootstrap), feature(derive_const))]
 #![feature(doc_cfg)]
 #![feature(doc_notable_trait)]
 #![feature(rustdoc_internals)]