Remove meth attribute

CHANGELOG.md

@@ -30,6 +30,7 @@
 - Polish arity mismatch error message a bit. https://github.com/rescript-lang/rescript/pull/7709
 - Suggest related functions with the expected arity in errors when it makes sense. https://github.com/rescript-lang/rescript/pull/7712
 - Improve error when a constructor expects an inline record. https://github.com/rescript-lang/rescript/pull/7713
+- Remove @meth attribute. https://github.com/rescript-lang/rescript/pull/7684
 
 #### :house: Internal
 

analysis/examples/larger-project/src/BucklescriptAnnotations.res

@@ -11,11 +11,8 @@ type someMutableFields = {
 
 @genType
 type someMethods = {
-  @meth
   "send": string => unit,
-  @meth
   "on": (string, (. int) => unit) => unit,
-  @meth
   "threeargs": (int, string, int) => string,
   "twoArgs": (. int, string) => int,
 }

compiler/frontend/ast_attributes.ml

@@ -74,15 +74,12 @@ let process_method_attributes_rev (attrs : t) =
         ({st with set = Some result}, acc)
       | _ -> (st, attr :: acc))
 
-type attr_kind = Nothing | Meth_callback of attr | Method of attr
+type attr_kind = Nothing | Meth_callback of attr
 
 let process_attributes_rev (attrs : t) : attr_kind * t =
-  Ext_list.fold_left attrs (Nothing, [])
-    (fun (st, acc) (({txt; loc}, _) as attr) ->
+  Ext_list.fold_left attrs (Nothing, []) (fun (st, acc) (({txt}, _) as attr) ->
       match (txt, st) with
       | "this", (Nothing | Meth_callback _) -> (Meth_callback attr, acc)
-      | "meth", (Nothing | Method _) -> (Method attr, acc)
-      | "this", _ -> Bs_syntaxerr.err loc Conflict_bs_bs_this_bs_meth
       | _, _ -> (st, attr :: acc))
 
 let external_attrs =

compiler/frontend/ast_attributes.mli

@@ -29,7 +29,7 @@ type ('a, 'b) st = {get: 'a option; set: 'b option}
 
 val process_method_attributes_rev : t -> (bool * bool, [`Get | `No_get]) st * t
 
-type attr_kind = Nothing | Meth_callback of attr | Method of attr
+type attr_kind = Nothing | Meth_callback of attr
 
 val process_attributes_rev : t -> attr_kind * t
 

compiler/frontend/ast_core_type_class_type.ml

@@ -75,7 +75,6 @@ let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
     match fst (Ast_attributes.process_attributes_rev ty.ptyp_attributes) with
     | Meth_callback _ ->
       Ast_typ_uncurry.to_method_callback_type loc self ~arity ty
-    | Method _ -> Bs_ast_mapper.default_mapper.typ self ty
     | Nothing -> Bs_ast_mapper.default_mapper.typ self ty)
   | Ptyp_object (methods, closed_flag) ->
     let ( +> ) attr (typ : Parsetree.core_type) =
@@ -90,8 +89,6 @@ let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
               let attrs, core_type =
                 match Ast_attributes.process_attributes_rev attrs with
                 | Nothing, attrs -> (attrs, ty) (* #1678 *)
-                | Method _, _ ->
-                  Location.raise_errorf ~loc "%@get/set conflicts with %@meth"
                 | Meth_callback attr, attrs -> (attrs, attr +> ty)
               in
               Ast_compatible.object_field name attrs (self.typ self core_type)
@@ -100,8 +97,6 @@ let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
               let attrs, core_type =
                 match Ast_attributes.process_attributes_rev attrs with
                 | Nothing, attrs -> (attrs, ty)
-                | Method _, _ ->
-                  Location.raise_errorf ~loc "%@get/set conflicts with %@meth"
                 | Meth_callback attr, attrs -> (attrs, attr +> ty)
               in
               Ast_compatible.object_field name attrs
@@ -113,7 +108,6 @@ let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
               let attrs, core_type =
                 match Ast_attributes.process_attributes_rev ptyp_attrs with
                 | Nothing, attrs -> (attrs, ty)
-                | Method attr, attrs -> (attrs, attr +> ty)
                 | Meth_callback attr, attrs -> (attrs, attr +> ty)
               in
               Ast_compatible.object_field label attrs (self.typ self core_type)

compiler/frontend/bs_builtin_ppx.ml

@@ -102,9 +102,6 @@ let expr_mapper ~async_context ~in_function_def (self : mapper)
       async_context := (old_in_function_def && !async_context) || async;
       in_function_def := true;
       Ast_async.make_function_async ~async (default_expr_mapper self e)
-    | Method _, _ ->
-      Location.raise_errorf ~loc:e.pexp_loc
-        "%@meth is not supported in function expression"
     | Meth_callback _, pexp_attributes ->
       (* FIXME: does it make sense to have a label for [this] ? *)
       async_context := false;

compiler/frontend/bs_syntaxerr.ml

@@ -64,7 +64,7 @@ let pp_error fmt err =
     | Illegal_attribute -> "Illegal attributes"
     | Unsupported_predicates -> "unsupported predicates"
     | Conflict_bs_bs_this_bs_meth ->
-      "%@this, %@bs, %@meth can not be applied at the same time"
+      "%@this and %@bs can not be applied at the same time"
     | Duplicated_bs_deriving -> "duplicate @deriving attribute"
     | Conflict_attributes -> "conflicting attributes "
     | Expect_string_literal -> "expect string literal "

compiler/syntax/src/res_parsetree_viewer.ml

@@ -198,10 +198,10 @@ let filter_parsing_attrs attrs =
       match attr with
       | ( {
             Location.txt =
-              ( "res.braces" | "ns.braces" | "res.iflet" | "res.ternary"
-              | "res.await" | "res.template" | "res.taggedTemplate"
-              | "res.patVariantSpread" | "res.dictPattern"
-              | "res.inlineRecordDefinition" );
+              ( "meth" | "res.braces" | "ns.braces" | "res.iflet"
+              | "res.ternary" | "res.await" | "res.template"
+              | "res.taggedTemplate" | "res.patVariantSpread"
+              | "res.dictPattern" | "res.inlineRecordDefinition" );
           },
           _ ) ->
         false

tests/analysis_tests/tests-reanalyze/deadcode/expected/deadcode.txt

@@ -9,10 +9,10 @@
   addVariantCaseDeclaration R4 AutoAnnotate.res:15:2 path:+AutoAnnotate.annotatedVariant
   Scanning BootloaderResource.cmt Source:BootloaderResource.res
   Scanning BucklescriptAnnotations.cmt Source:BucklescriptAnnotations.res
-  addValueDeclaration +bar BucklescriptAnnotations.res:25:4 path:+BucklescriptAnnotations
-  addValueDeclaration +f BucklescriptAnnotations.res:26:6 path:+BucklescriptAnnotations
-  addValueReference BucklescriptAnnotations.res:26:6 --> BucklescriptAnnotations.res:25:11
-  addValueReference BucklescriptAnnotations.res:25:4 --> BucklescriptAnnotations.res:26:6
+  addValueDeclaration +bar BucklescriptAnnotations.res:22:4 path:+BucklescriptAnnotations
+  addValueDeclaration +f BucklescriptAnnotations.res:23:6 path:+BucklescriptAnnotations
+  addValueReference BucklescriptAnnotations.res:23:6 --> BucklescriptAnnotations.res:22:11
+  addValueReference BucklescriptAnnotations.res:22:4 --> BucklescriptAnnotations.res:23:6
   Scanning ComponentAsProp.cmt Source:ComponentAsProp.res
   addValueDeclaration +make ComponentAsProp.res:6:4 path:+ComponentAsProp
   addRecordLabelDeclaration title ComponentAsProp.res:6:12 path:+ComponentAsProp.props
@@ -2594,9 +2594,9 @@ File References
   BucklescriptAnnotations is a dead module as all its items are dead.
 
   Warning Dead Value
-  BucklescriptAnnotations.res:25:1-70
+  BucklescriptAnnotations.res:22:1-70
   bar is never used
-  <-- line 25
+  <-- line 22
   @dead("bar") let bar = (x: someMethods) => {
 
   Warning Dead Exception

tests/analysis_tests/tests-reanalyze/deadcode/src/BucklescriptAnnotations.res

@@ -11,11 +11,8 @@ type someMutableFields = {
 
 @genType
 type someMethods = {
-  @meth
   "send": string => unit,
-  @meth
   "on": (string, (. int) => unit) => unit,
-  @meth
   "threeargs": (int, string, int) => string,
   "twoArgs": (. int, string) => int,
 }

tests/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res

@@ -11,11 +11,8 @@ type someMutableFields = {
 
 @genType
 type someMethods = {
-  @meth
   "send": string => unit,
-  @meth
   "on": (string, int => unit) => unit,
-  @meth
   "threeargs": (int, string, int) => string,
   "twoArgs": (int, string) => int,
 }

tests/syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res

@@ -20,7 +20,6 @@ type state = {
 }
 
 type state = {
-  @meth
   "send": string =>
 }
 

tests/syntax_tests/data/parsing/errors/typexpr/expected/bsObjSugar.res.txt

@@ -51,85 +51,85 @@
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:25:1
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:24:1
 
-  23 │   @meth
-  24 │   "send": string =>
-  25 │ }
-  26 │ 
-  27 │ type state = {
+  22 │ type state = {
+  23 │   "send": string =>
+  24 │ }
+  25 │ 
+  26 │ type state = {
 
   I'm missing a type here
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:28:10
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:27:10
 
-  26 │ 
-  27 │ type state = {
-  28 │   "age": ,
-  29 │   "name": string
-  30 │ }
+  25 │ 
+  26 │ type state = {
+  27 │   "age": ,
+  28 │   "name": string
+  29 │ }
 
   I'm missing a type here
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:33:15
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:32:15
 
-  31 │ 
-  32 │ type state = {
-  33 │   @set "age": ,
-  34 │   "name": string
-  35 │ }
+  30 │ 
+  31 │ type state = {
+  32 │   @set "age": ,
+  33 │   "name": string
+  34 │ }
 
   I'm missing a type here
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:37:25
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:36:25
 
-  35 │ }
-  36 │ 
-  37 │ type state = {.. "age": }
-  38 │ type state = {
-  39 │   ..
+  34 │ }
+  35 │ 
+  36 │ type state = {.. "age": }
+  37 │ type state = {
+  38 │   ..
 
   I'm missing a type here
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:40:8-41:8
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:39:8-40:8
 
-  38 │ type state = {
-  39 │   ..
-  40 │   "age" 
-  41 │   "name": string
-  42 │ }
-  43 │ 
+  37 │ type state = {
+  38 │   ..
+  39 │   "age" 
+  40 │   "name": string
+  41 │ }
+  42 │ 
 
   Did you forget a `:` here? It signals the start of a type
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:46:3-11
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:45:3-11
 
-  44 │ type websocket = {
-  45 │   "id":
-  46 │   "channel": channelTyp
-  47 │ }
-  48 │ 
+  43 │ type websocket = {
+  44 │   "id":
+  45 │   "channel": channelTyp
+  46 │ }
+  47 │ 
 
   I'm missing a type here
 
 
   Syntax error!
-  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:50:7-51:0
+  syntax_tests/data/parsing/errors/typexpr/bsObjSugar.res:49:7-50:0
 
-  48 │ 
-  49 │ type websocket = {
-  50 │   "id"
-  51 │ 
+  47 │ 
+  48 │ type websocket = {
+  49 │   "id"
+  50 │ 
 
   Did you forget a `:` here? It signals the start of a type
 
@@ -141,8 +141,7 @@ type nonrec state =
   < url: string  ;protocols: [%rescript.typehole ]  ;websocket: Websocket.t  
     > 
 type nonrec state = < url: string  ;protocols: [%rescript.typehole ]   > 
-type nonrec state =
-  < send: string -> [%rescript.typehole ] (a:1) [@meth ]  > 
+type nonrec state = < send: string -> [%rescript.typehole ] (a:1)   > 
 type nonrec state = < age: [%rescript.typehole ]  ;name: string   > 
 type nonrec state = < age: [%rescript.typehole ] [@set ] ;name: string   > 
 type nonrec state = < age: [%rescript.typehole ]   ;.. > 

tests/syntax_tests/data/printer/typexpr/arrow.res

@@ -67,15 +67,15 @@ type t = @attr (fooWithSuperLongIdentifierNameLooooooooooooooooooooooooooooooooo
 type t = @attr @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (fooWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, barWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, bazWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @attr2 @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => unit
 
 
-external debounce: (int, @meth unit) => unit = "debounce";
+external debounce: (int, unit) => unit = "debounce";
 
-external debounce: int => @meth (unit => unit) = "debounce";
+external debounce: int => (unit => unit) = "debounce";
 
-external debounce: (int, @meth (unit => unit)) => @meth (unit => unit) = "debounce";
+external debounce: (int, (unit => unit)) => (unit => unit) = "debounce";
 
-external debounce: (int, @meth (unit => unit), @meth (unit => unit)) => @meth (unit => unit) = "debounce";
+external debounce: (int, (unit => unit), (unit => unit)) => (unit => unit) = "debounce";
 
-external debounce: (int, @meth (unit => unit), @meth ( unit => @meth (unit => unit))) => @meth (unit => unit) = "debounce";
+external debounce: (int, (unit => unit), ( unit => (unit => unit))) => (unit => unit) = "debounce";
 
 type returnTyp = (int, int) => @magic float
 type returnTyp = (intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @magic float

tests/syntax_tests/data/printer/typexpr/expected/arrow.res.txt

@@ -174,20 +174,15 @@ type t = @attr
   floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
 ) => unit
 
-external debounce: (int, @meth unit) => unit = "debounce"
+external debounce: (int, unit) => unit = "debounce"
 
-external debounce: int => @meth (unit => unit) = "debounce"
+external debounce: int => unit => unit = "debounce"
 
-external debounce: (int, @meth (unit => unit)) => @meth (unit => unit) = "debounce"
+external debounce: (int, unit => unit) => unit => unit = "debounce"
 
-external debounce: (int, @meth (unit => unit), @meth (unit => unit)) => @meth (unit => unit) =
-  "debounce"
+external debounce: (int, unit => unit, unit => unit) => unit => unit = "debounce"
 
-external debounce: (
-  int,
-  @meth (unit => unit),
-  @meth (unit => @meth (unit => unit)),
-) => @meth (unit => unit) = "debounce"
+external debounce: (int, unit => unit, unit => unit => unit) => unit => unit = "debounce"
 
 type returnTyp = (int, int) => @magic float
 type returnTyp = (

tests/tests/src/meth_annotation.res

@@ -1,5 +1,4 @@
-// The @meth annotation is for backwards compatibility. It just makes the type uncurried.
-type person = {@meth "say": (string, string) => unit}
+type person = {"say": (string, string) => unit}
 
 @val external john: person = "john"
 

tests/tests/src/reasonReact.res

@@ -117,7 +117,7 @@ and oldNewSelf<'state, 'retainedProps, 'action> = {
 type rec jsComponentThis<'state, 'props, 'retainedProps, 'action> = {
   "state": totalState<'state, 'retainedProps, 'action>,
   "props": {"reasonProps": 'props},
-  "setState": @meth (
+  "setState": (
     (
       totalState<'state, 'retainedProps, 'action>,
       'props,