From 12ac49afc9e1c33fe94f01dfca9efda4d7fed0b2 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Sun, 17 Nov 2019 18:43:26 -0500 Subject: Add feature gate for &mut in const fns --- src/libsyntax_pos/symbol.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libsyntax_pos') diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 3059b059691..c98063275dd 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -203,6 +203,7 @@ symbols! { const_constructor, const_extern_fn, const_fn, + const_fn_mut_refs, const_fn_union, const_generics, const_if_match, -- cgit 1.4.1-3-g733a5 From d24ae2577fad83d581d090816303b0f1842f1514 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Thu, 21 Nov 2019 12:38:14 -0500 Subject: Rename feature gate --- src/librustc_feature/active.rs | 2 +- src/librustc_mir/transform/qualify_min_const_fn.rs | 2 +- src/libsyntax_pos/symbol.rs | 2 +- src/test/ui/consts/const_fn_mut_refs.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libsyntax_pos') diff --git a/src/librustc_feature/active.rs b/src/librustc_feature/active.rs index 706e1024365..8e3ef4f3d9d 100644 --- a/src/librustc_feature/active.rs +++ b/src/librustc_feature/active.rs @@ -528,7 +528,7 @@ declare_features! ( (active, cfg_sanitize, "1.41.0", Some(39699), None), /// Allows using `&mut` in constant functions. - (active, const_fn_mut_refs, "1.41.0", None, None), + (active, const_mut_refs, "1.41.0", Some(57349), None), // ------------------------------------------------------------------------- // feature-group-end: actual feature gates diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs index 28240f6beca..20bccb59a5c 100644 --- a/src/librustc_mir/transform/qualify_min_const_fn.rs +++ b/src/librustc_mir/transform/qualify_min_const_fn.rs @@ -81,7 +81,7 @@ fn check_ty(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, span: Span, fn_def_id: DefId) -> Mc for ty in ty.walk() { match ty.kind { ty::Ref(_, _, hir::Mutability::Mutable) => { - if !tcx.features().const_fn_mut_refs { + if !tcx.features().const_mut_refs { return Err(( span, "mutable references in const fn are unstable".into(), diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index c98063275dd..d700f779e17 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -203,13 +203,13 @@ symbols! { const_constructor, const_extern_fn, const_fn, - const_fn_mut_refs, const_fn_union, const_generics, const_if_match, const_indexing, const_in_array_repeat_expressions, const_let, + const_mut_refs, const_panic, const_raw_ptr_deref, const_raw_ptr_to_usize_cast, diff --git a/src/test/ui/consts/const_fn_mut_refs.rs b/src/test/ui/consts/const_fn_mut_refs.rs index 764c45b386b..2263a130284 100644 --- a/src/test/ui/consts/const_fn_mut_refs.rs +++ b/src/test/ui/consts/const_fn_mut_refs.rs @@ -1,6 +1,6 @@ // run-pass -#![feature(const_fn_mut_refs)] +#![feature(const_mut_refs)] struct Foo { x: i32 -- cgit 1.4.1-3-g733a5