about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-12-05 19:03:21 +0100
committerGitHub <noreply@github.com>2019-12-05 19:03:21 +0100
commita008aff0758268c03496d25686cf74e270cef8ba (patch)
tree2527eb2cfba3e52b99aa55f4f199e2a64ccfc67b /src/libcore
parent0e18ca14479df69fd02b68945c3155c50c3effa4 (diff)
parent2d83b7608070d6ad250e8cd6d9d5a7d4be628dc4 (diff)
Rollup merge of #67055 - lqd:const_qualif, r=oli-obk
Make const-qualification look at more `const fn`s

As explained in a lot more detail in #67053 this makes const-qualification not ignore the unstable const fns in libcore.

r? @oli-obk cc @ecstatic-morse

(Still a bit unsure about the `cfg`s here, for bootstrapping, does that seem correct ?)

Fixes #67053.
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index ec19392450a..188ea1a9631 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -74,6 +74,8 @@
 #![feature(const_fn)]
 #![feature(const_fn_union)]
 #![feature(const_generics)]
+#![cfg_attr(not(bootstrap), feature(const_ptr_offset_from))]
+#![cfg_attr(not(bootstrap), feature(const_type_name))]
 #![feature(custom_inner_attributes)]
 #![feature(decl_macro)]
 #![feature(doc_cfg)]