small refactoring

Summary:
Rename the function `genOCamlType'` and `genOCamlToJson` to `genOCamlTypeFromField` and `genOCamlToJsonFromField` to make sure they are called when processing  field types.

Some cases in `genOCamlToJson` and `genOCamlToJsonFromField` were duplicated.

This is in preparation of further changes (see task)

Reviewed By: donsbot

Differential Revision: D62968918

fbshipit-source-id: 8d9979ba9d8193b9909d795404a32e3cae2ffb1f

hphp/hack/src/typing/write_symbol_info/glean/fbthrift.ml

@@ -229,7 +229,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and EnumValueDef: sig
@@ -838,7 +838,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and StructType: sig
@@ -1234,7 +1234,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and ServiceDefinition: sig
@@ -1685,7 +1685,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and Namespace: sig

hphp/hack/src/typing/write_symbol_info/glean/gencode.ml

@@ -39,7 +39,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and GenCode: sig
@@ -133,7 +133,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and GenCodeBySource: sig
@@ -203,7 +203,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 

hphp/hack/src/typing/write_symbol_info/glean/hack.ml

@@ -412,8 +412,8 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
-  and to_json_value v = JSON_String (List.map ~f:Base64.encode_string v |> String.concat ~sep:"")
+  and to_json_key x = JSON_String x
+  and to_json_value x = JSON_String (List.map ~f:Base64.encode_string x|> String.concat ~sep:"")
 end
 
 and ClassDefinition: sig
@@ -513,7 +513,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and DeclarationLocation: sig
@@ -759,7 +759,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and MethodOccurrence: sig
@@ -2223,7 +2223,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and TargetUsesAbs: sig
@@ -2672,7 +2672,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and DeclarationTarget: sig

hphp/hack/src/typing/write_symbol_info/glean/src.ml

@@ -212,7 +212,7 @@ end = struct
     | Id f -> Util.id f
     | Key t -> Util.key (to_json_key t)
 
-  and to_json_key str = JSON_String str
+  and to_json_key x = JSON_String x
 end
 
 and RangeContains: sig
@@ -288,7 +288,7 @@ end = struct
     | Key t -> Util.key (to_json_key t)
 
   and to_json_key x = File.to_json x
-  and to_json_value str = JSON_String str
+  and to_json_value x = JSON_String x
 end
 
 
@@ -328,7 +328,7 @@ end = struct
   type t = PackedByteSpansGroup.t list
   [@@deriving ord]
 
-  let to_json l = JSON_Array (List.map ~f:(fun x -> PackedByteSpansGroup.to_json x) l)
+  let to_json x = JSON_Array (List.map ~f:(fun x -> PackedByteSpansGroup.to_json x) x)
 end
 
 and PackedByteSpansGroup: sig