Revert "make parsing of @deprecated with migration info an experiment…

…al feature" This reverts commit 59c902c.
rescript-lang · zth · Oct 6, 2025 · Aug 24, 2025 · Aug 25, 2025 · Aug 25, 2025
commit 74405a7595fe265a610633e4d0d0370930f76b27
diff --git a/compiler/ml/builtin_attributes.ml b/compiler/ml/builtin_attributes.ml
@@ -75,12 +75,6 @@ let cat s1 s2 =
 
 let rec deprecated_of_attrs = function
   | [] -> None
-  | ( {txt = "deprecated"; _},
-      PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record _}, _)}] )
-    :: _ ->
-    (* Skip record payloads here. `deprecated_of_attrs_with_migrate` should be used if we want to 
-      parse record payloads. *)
-    None
   | ({txt = "ocaml.deprecated" | "deprecated"; _}, p) :: _ ->
     Some (string_of_opt_payload p)
   | _ :: tl -> deprecated_of_attrs tl
@@ -132,18 +126,13 @@ let rec deprecated_of_attrs_with_migrate = function
   | _ :: tl -> deprecated_of_attrs_with_migrate tl
 
 let check_deprecated ?deprecated_context loc attrs s =
-  if Experimental_features.is_enabled DeprecatedMigrations then (
-    match deprecated_of_attrs_with_migrate attrs with
-    | None -> ()
-    | Some (txt, migration_template, migration_in_pipe_chain_template) ->
-      !Cmt_utils.record_deprecated_used
-        ?deprecated_context ?migration_template
-        ?migration_in_pipe_chain_template loc txt;
-      Location.deprecated loc (cat s txt))
-  else
-    match deprecated_of_attrs attrs with
-    | None -> ()
-    | Some txt -> Location.deprecated loc (cat s txt)
+  match deprecated_of_attrs_with_migrate attrs with
+  | None -> ()
+  | Some (txt, migration_template, migration_in_pipe_chain_template) ->
+    !Cmt_utils.record_deprecated_used
+      ?deprecated_context ?migration_template ?migration_in_pipe_chain_template
+      loc txt;
+    Location.deprecated loc (cat s txt)
 
 let check_deprecated_inclusion ~def ~use loc attrs1 attrs2 s =
   match (deprecated_of_attrs attrs1, deprecated_of_attrs attrs2) with

diff --git a/compiler/ml/experimental_features.ml b/compiler/ml/experimental_features.ml
@@ -1,14 +1,12 @@
-type feature = LetUnwrap | DeprecatedMigrations
+type feature = LetUnwrap
 
 let to_string (f : feature) : string =
   match f with
   | LetUnwrap -> "LetUnwrap"
-  | DeprecatedMigrations -> "DeprecatedMigrations"
 
 let from_string (s : string) : feature option =
   match s with
   | "LetUnwrap" -> Some LetUnwrap
-  | "DeprecatedMigrations" -> Some DeprecatedMigrations
   | _ -> None
 
 module FeatureSet = Set.Make (struct

diff --git a/compiler/ml/experimental_features.mli b/compiler/ml/experimental_features.mli
@@ -1,4 +1,4 @@
-type feature = LetUnwrap | DeprecatedMigrations
+type feature = LetUnwrap
 
 val enable_from_string : string -> unit
 val is_enabled : feature -> bool

diff --git a/docs/docson/build-schema.json b/docs/docson/build-schema.json
@@ -489,10 +489,6 @@
         "LetUnwrap": {
           "type": "boolean",
           "description": "Enable `let?` syntax."
-        },
-        "DeprecatedMigrations": {
-          "type": "boolean",
-          "description": "Enable parsing of the `@deprecated` attribute with migration information."
         }
       },
       "additionalProperties": false

diff --git a/rewatch/CompilerConfigurationSpec.md b/rewatch/CompilerConfigurationSpec.md
@@ -122,7 +122,6 @@ An object of feature flags to enable experimental compiler behavior. Only suppor
 Currently supported features:
 
 - LetUnwrap: Enable `let?` syntax.
-- DeprecatedMigrations: Enable parsing of the `@deprecated` attribute with migration information.
 
 ### Warnings
 

diff --git a/rewatch/src/config.rs b/rewatch/src/config.rs
@@ -229,7 +229,6 @@ pub enum DeprecationWarning {
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub enum ExperimentalFeature {
     LetUnwrap,
-    DeprecatedMigrations,
 }
 
 impl<'de> serde::Deserialize<'de> for ExperimentalFeature {
@@ -249,9 +248,8 @@ impl<'de> serde::Deserialize<'de> for ExperimentalFeature {
             {
                 match v {
                     "LetUnwrap" => Ok(ExperimentalFeature::LetUnwrap),
-                    "DeprecatedMigrations" => Ok(ExperimentalFeature::DeprecatedMigrations),
                     other => {
-                        let available = ["LetUnwrap", "DeprecatedMigrations"].join(", ");
+                        let available = ["LetUnwrap"].join(", ");
                         Err(DeError::custom(format!(
                             "Unknown experimental feature '{other}'. Available features: {available}",
                         )))
@@ -550,7 +548,6 @@ impl Config {
                         "-enable-experimental".to_string(),
                         match feature {
                             ExperimentalFeature::LetUnwrap => "LetUnwrap",
-                            ExperimentalFeature::DeprecatedMigrations => "DeprecatedMigrations",
                         }
                         .to_string(),
                     ]

diff --git a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
@@ -1,9 +1,12 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Cleaned 0/428
 Parsed 2 source files
 Compiled 2 modules
 =======
+=======
+>>>>>>> 91e157ad8 (Revert "make parsing of @deprecated with migration info an experimental feature")
 Cleaned 0/113
 Parsed 4 source files
 Compiled 3 modules
@@ -70,12 +73,15 @@ Compiled 3 modules
   Use `Array.joinUnsafe` instead.
 
 
+<<<<<<< HEAD
 >>>>>>> 434a19184 (migrate wip)
 =======
 Cleaned 0/115
 Parsed 2 source files
 Compiled 2 modules
 >>>>>>> d746a071c (make parsing of @deprecated with migration info an experimental feature)
+=======
+>>>>>>> 91e157ad8 (Revert "make parsing of @deprecated with migration info an experimental feature")
 
 The field 'bs-dependencies' found in the package config of '@testrepo/deprecated-config' is deprecated and will be removed in a future version.
 Use 'dependencies' instead.

diff --git a/rewatch/tests/snapshots/rename-file-internal-dep.txt b/rewatch/tests/snapshots/rename-file-internal-dep.txt
@@ -11,6 +11,30 @@ Use 'dev-dependencies' instead.
 The field 'bsc-flags' found in the package config of '@testrepo/deprecated-config' is deprecated and will be removed in a future version.
 Use 'compiler-flags' instead.
 
+  [1;33mWarning number 3[0m
+  [36m/packages/main/src/Main.res[0m:[2m1:1-6[0m
+
+  [1;33m1[0m [2m│[0m [1;33mJs.log[0m("01")
+  2 [2m│[0m Dep01.log()
+  3 [2m│[0m 
+
+  deprecated: Js.log
+  Use `Console.log` instead.
+
+
+  [1;33mWarning number 3[0m
+  [36m/packages/main/src/Main.res[0m:[2m4:1-6[0m
+
+  2 [2m│[0m Dep01.log()
+  3 [2m│[0m 
+  [1;33m4[0m [2m│[0m [1;33mJs.log[0m(InternalDep.value)
+  5 [2m│[0m 
+  6 [2m│[0m module Array = Belt.Array
+
+  deprecated: Js.log
+  Use `Console.log` instead.
+
+
   [1;31mWe've found a bug for you![0m
   [36m/packages/main/src/Main.res[0m:[2m4:8-24[0m