Remove more "bs."

Author: cknitt

jscomp/build_tests/cmd/input.js

@@ -7,9 +7,9 @@ var bsc_exe_path = require("../../../scripts/bin_path").bsc_exe;
 var react = `
 type u 
 
-external a : u = "react" [@@bs.module]
+external a : u = "react" [@@module]
 
-external b : unit -> int = "bool" [@@bs.module "react"]
+external b : unit -> int = "bool" [@@module "react"]
 
 let v = a
 let h = b ()
@@ -19,9 +19,9 @@ var foo_react = `
 type bla
 
 
-external foo : bla = "foo.react" [@@bs.module]
+external foo : bla = "foo.react" [@@module]
 
-external bar : unit -> bla = "bar" [@@bs.val] [@@bs.module "foo.react"]
+external bar : unit -> bla = "bar" [@@bs.val] [@@module "foo.react"]
 
 let c = foo 
 

jscomp/frontend/ast_attributes.ml

@@ -88,7 +88,7 @@ let process_attributes_rev (attrs : t) : attr_kind * t =
  (Uncurry attr, acc) (* TODO: warn unused/duplicated attribute *)
  | ("bs.this" | "this"), (Nothing | Meth_callback _) ->
  (Meth_callback attr, acc)
- | ("bs.meth" | "meth"), (Nothing | Method _) -> (Method attr, acc)
+ | "meth", (Nothing | Method _) -> (Method attr, acc)
  | ("bs" | "bs.this" | "this"), _ ->
  Bs_syntaxerr.err loc Conflict_bs_bs_this_bs_meth
  | _, _ -> (st, attr :: acc))
@@ -154,8 +154,7 @@ let rs_externals (attrs : t) pval_prim =
  || Ext_array.exists external_attrs (fun (x : string) -> txt = x))
  || prims_to_be_encoded pval_prim
 
-let is_inline : attr -> bool =
- fun ({txt}, _) -> txt = "bs.inline" || txt = "inline"
+let is_inline : attr -> bool = fun ({txt}, _) -> txt = "inline"
 
 let has_inline_payload (attrs : t) = Ext_list.find_first attrs is_inline
 
@@ -223,8 +222,8 @@ let iter_process_bs_string_int_unwrap_uncurry (attrs : t) =
  Ext_list.iter attrs (fun (({txt; loc = _}, (payload : _)) as attr) ->
  match txt with
  | "bs.string" | "string" -> assign `String attr
- | "bs.int" | "int" -> assign `Int attr
- | "bs.ignore" | "ignore" -> assign `Ignore attr
+ | "int" -> assign `Int attr
+ | "ignore" -> assign `Ignore attr
  | "bs.unwrap" | "unwrap" -> assign `Unwrap attr
  | "bs.uncurry" | "uncurry" ->
  assign (`Uncurry (Ast_payload.is_single_int payload)) attr

jscomp/frontend/ast_external_process.ml

@@ -266,7 +266,7 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
  st with
  call_name = Some (name_from_payload_or_prim ~loc payload);
  }
- | "bs.module" | "module" -> (
+ | "module" -> (
  match payload with
  | PStr
  [
@@ -391,7 +391,7 @@ let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
  {st with set_name = Some (name_from_payload_or_prim ~loc payload)}
  | "get" ->
  {st with get_name = Some (name_from_payload_or_prim ~loc payload)}
- | "bs.new" | "new" ->
+ | "new" ->
  {st with new_name = Some (name_from_payload_or_prim ~loc payload)}
  | "set_index" ->
  if String.length prim_name_check <> 0 then

jscomp/frontend/external_arg_spec.mli

@@ -29,7 +29,7 @@ type cst = private Arg_int_lit of int | Arg_string_lit of string * delim
 type attr =
  | Poly_var_string of {descr: (string * string) list}
  | Poly_var of {descr: (string * string) list option}
- | Int of (string * int) list (* ([`a | `b ] [@bs.int])*)
+ | Int of (string * int) list (* ([`a | `b ] [@int])*)
  | Arg_cst of cst
  | Fn_uncurry_arity of
  int (* annotated with [@bs.uncurry ] or [@bs.uncurry 2]*)

jscomp/frontend/typemod_hide.ml

@@ -46,7 +46,7 @@ let no_type_defined (x : Parsetree.structure_item) =
  generated code from:
  {[
  external %private x : int -> int = "x"
- [@@bs.module "./x"]
+ [@@module "./x"]
  ]}
  *)
  | _ -> false

jscomp/gentype/Annotation.ml

@@ -20,7 +20,7 @@ let toString annotation =
 let tagIsGenType s = s = "genType" || s = "gentype"
 let tagIsGenTypeAs s = s = "genType.as" || s = "gentype.as"
 let tagIsAs s = s = "as"
-let tagIsInt s = s = "bs.int" || s = "int"
+let tagIsInt s = s = "int"
 let tagIsString s = s = "bs.string" || s = "string"
 
 let tagIsTag s = s = "tag"

jscomp/gentype/TranslateStructure.ml

@@ -293,7 +293,7 @@ and translateStructureItem ~config ~outputFileRelative ~resolver ~typeEnv
  |> Translation.combine
  | {
  str_desc =
- (* ReScript's encoding of bs.module: include with constraint. *)
+ (* ReScript's encoding of @module: include with constraint. *)
  Tstr_include
  {
  incl_mod =

jscomp/gentype/Translation.ml

@@ -112,7 +112,7 @@ let translateValue ~attributes ~config ~docString ~outputFileRelative ~resolver
 
 (**
  [@genType]
- [@bs.module] external myBanner : ReasonReact.reactClass = "./MyBanner";
+ [@module] external myBanner : ReasonReact.reactClass = "./MyBanner";
 *)
 let translatePrimitive ~config ~outputFileRelative ~resolver ~typeEnv
  (valueDescription : Typedtree.value_description) : t =

jscomp/ml/oprint.ml

@@ -288,7 +288,7 @@ and print_simple_out_type ppf =
  Otyp_arrow ("", Otyp_constr (Oide_ident "unit", []),tyl)
  else tyl
  in 
- fprintf ppf "@[<0>(%a@ [@bs.meth])@]" print_out_type_1 res
+ fprintf ppf "@[<0>(%a@ [@meth])@]" print_out_type_1 res
  | Otyp_constr (Oide_dot (Oide_dot (Oide_ident "Js_OO", "Callback" ), _),
  [tyl])
  -> 

jscomp/runtime/caml_sys.res

@@ -68,7 +68,7 @@ let sys_time = () =>
 
 /*
 type spawnResult
-external spawnSync : string -> spawnResult = "spawnSync" [@@bs.module "child_process"]
+external spawnSync : string -> spawnResult = "spawnSync" [@@module "child_process"]
 
 external readAs : spawnResult -> 
  <