diff options
| author | bors <bors@rust-lang.org> | 2018-12-06 10:18:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-06 10:18:17 +0000 |
| commit | 128a1fa4e1f85e04f522653bb9bee83ed6523440 (patch) | |
| tree | cf1bb66e041bed563653ac45ea58bfa863d7518a /src/libsyntax | |
| parent | 77a6a61f066af3dd693d8527a8a1bf5a446d295c (diff) | |
| parent | cb71752f911c47426e208a9f5f1862d4c0e56aa4 (diff) | |
| download | rust-128a1fa4e1f85e04f522653bb9bee83ed6523440.tar.gz rust-128a1fa4e1f85e04f522653bb9bee83ed6523440.zip | |
Auto merge of #55635 - oli-obk:min_const_unsafe_fn, r=nikomatsakis
Allow calling `const unsafe fn` in `const fn` behind a feature gate cc #55607 r? @Centril
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index fac7ff2bf34..bfdc75378d5 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -492,6 +492,9 @@ declare_features! ( // `extern crate self as foo;` puts local crate root into extern prelude under name `foo`. (active, extern_crate_self, "1.31.0", Some(56409), None), + + // Allows calling `const unsafe fn` inside `unsafe` blocks in `const fn` functions. + (active, min_const_unsafe_fn, "1.31.0", Some(55607), None), ); declare_features! ( |