@bs.deriving -> @deriving

Author: cknitt

jscomp/ext/warnings.ml

@@ -630,7 +630,7 @@ let descriptions =
     (101, "Unused bs attributes");
     (102, "Polymorphic comparison introduced (maybe unsafe)");
     (103, "Fragile FFI definitions");
-    (104, "bs.deriving warning with customized message ");
+    (104, "@deriving warning with customized message ");
     ( 105,
       "External name is inferred from val name is unsafe from refactoring when \
        changing value name" );

jscomp/frontend/ast_attributes.ml

@@ -169,7 +169,7 @@ let process_derive_type (attrs : t) : derive_attr * t =
     ({bs_deriving = None}, [])
     (fun (st, acc) (({txt; loc}, payload) as attr) ->
       match txt with
-      | "bs.deriving" | "deriving" -> (
+      | "deriving" -> (
         match st.bs_deriving with
         | None ->
           ( {

jscomp/frontend/bs_syntaxerr.ml

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

jscomp/ounit_tests/ounit_cmd_tests.ml

@@ -271,7 +271,7 @@ let rec y = A y;;
     end;
     __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-    type -'a t = {k : 'a } [@@bs.deriving abstract]
+    type -'a t = {k : 'a } [@@deriving abstract]
     |} in
       OUnit.assert_bool __LOC__
         (Ext_string.contain_substring should_err.stderr "contravariant")

jscomp/test/ast_abstract_test.res

@@ -37,7 +37,7 @@ let () = {
   | A
   | B [@as 3]
   | C
-[@@bs.deriving {jsConverter = newType}]      
+[@@deriving {jsConverter = newType}]      
 
 let id  x = 
     eq  __LOC__ (aFromJs (aToJs x ))  x 
@@ -54,7 +54,7 @@ let a1 = aToJs B */
   | D1
   | D2 
   | D3 
-[@@bs.deriving {jsConverter = newType }]       
+[@@deriving {jsConverter = newType }]       
 
 
 let b0 = bToJs D0 
@@ -70,7 +70,7 @@ let () = idb D0; idb D1; idb D2 ; idb D3 */
   | D1
   | D2 
   | D3 
-[@@bs.deriving {jsConverter = {newType }}]       
+[@@deriving {jsConverter = {newType }}]       
 
 let c0 = cToJs D0 
 
@@ -80,14 +80,14 @@ let () = idc D0; idc D1 ; idc D2; idc D3 */
 
 /* type h = 
   | JsMapperEraseType
-  | B [@@bs.deriving {accessors; jsConverter = newType} ] */
+  | B [@@deriving {accessors; jsConverter = newType} ] */
 
 /*
 type z =    
   | ZFromJs 
   | ZToJs
   | ZXx (* not overridden *)
-[@@bs.deriving {
+[@@deriving {
   accessors;
   jsConverter
 }

jscomp/test/build.ninja

@@ -63,7 +63,7 @@ var code = n => {
 var polyCode = n => {
   var content = `type t = [ \n ${polyConstructors(
     n
-  )}\n ] [@@bs.deriving jsConverter] `;
+  )}\n ] [@@deriving jsConverter] `;
   var eq = `
         let eq (x : t option) (y: t option) = 
             match x with