From: Owen Avery <[email protected]>

Since rust-feature-defs.h is automatically generated, manually
backported features should go in rust-feature-defs-rfl.h.

gcc/rust/ChangeLog:

        * checks/errors/feature/rust-feature-defs.h
        (DERIVE_COERCE_POINTEE): Move to...
        * checks/errors/feature/rust-feature-defs-rfl.h
        (DERIVE_COERCE_POINTEE): ...here.

Signed-off-by: Owen Avery <[email protected]>

Tested on x86_64-pc-linux-gnu.

---
 gcc/rust/checks/errors/feature/rust-feature-defs-rfl.h | 4 ++++
 gcc/rust/checks/errors/feature/rust-feature-defs.h     | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/rust/checks/errors/feature/rust-feature-defs-rfl.h 
b/gcc/rust/checks/errors/feature/rust-feature-defs-rfl.h
index 587461961ff..25f3dff3496 100644
--- a/gcc/rust/checks/errors/feature/rust-feature-defs-rfl.h
+++ b/gcc/rust/checks/errors/feature/rust-feature-defs-rfl.h
@@ -27,3 +27,7 @@ FEATURE_ACTIVE ("cfi_encoding", CFI_ENCODING, "1.71.0", 
ISSUE_SOME (89653),
 // FIXME: We need to enable this when the compatibility mode is >= 1.60 I 
guess?
 FEATURE_ACTIVE ("used_with_arg", USED_WITH_ARG, "1.60.0", ISSUE_SOME (93798),
                EDITION_NONE)
+FEATURE_ACTIVE ("derive_coerce_pointee", DERIVE_COERCE_POINTEE,
+               "1.84.0" /* Not sure about the version number for this one */,
+               /* We also need a compatibility check to enable this */
+               ISSUE_SOME (123430), EDITION_NONE)
diff --git a/gcc/rust/checks/errors/feature/rust-feature-defs.h 
b/gcc/rust/checks/errors/feature/rust-feature-defs.h
index b91a041c665..b541bbd2350 100644
--- a/gcc/rust/checks/errors/feature/rust-feature-defs.h
+++ b/gcc/rust/checks/errors/feature/rust-feature-defs.h
@@ -521,10 +521,6 @@ FEATURE_ACTIVE ("destructuring_assignment", 
DESTRUCTURING_ASSIGNMENT, "1.49.0",
                ISSUE_SOME (71126), EDITION_NONE)
 FEATURE_ACTIVE ("cfg_panic", CFG_PANIC, "1.49.0", ISSUE_SOME (77443),
                EDITION_NONE)
-FEATURE_ACTIVE ("derive_coerce_pointee", DERIVE_COERCE_POINTEE,
-               "1.84.0" /* Not sure about the version number for this one */,
-               /* We also need a compatibility check to enable this */
-               ISSUE_SOME (123430), EDITION_NONE)
 FEATURE_REMOVED ("import_shadowing", IMPORT_SHADOWING, "1.0.0", ISSUE_NONE,
                 REASON_NONE)
 FEATURE_REMOVED ("managed_boxes", MANAGED_BOXES, "1.0.0", ISSUE_NONE,
-- 
2.55.0

Reply via email to