Stricter code style.

rescript-association · Nov 1, 2018 · c1e24ba · c1e24ba
1 parent 385faeb
commit c1e24ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Converter.re b/src/Converter.re
@@ -120,9 +120,9 @@ let typToConverterOpaque =
           | Not_found => exportTypeMapFromOtherFiles |> StringMap.find(s)
           }
         ) {
-        | {annotation: GenTypeOpaque} => (IdentC, true)
-        | {annotation: NoGenType} => (IdentC, true)
-        | {typeVars, typ} =>
+        | {annotation: GenTypeOpaque, _} => (IdentC, true)
+        | {annotation: NoGenType, _} => (IdentC, true)
+        | {typeVars, typ, _} =>
           let pairs =
             try (List.combine(typeVars, typeArguments)) {
             | Invalid_argument(_) => []

diff --git a/src/EmitJs.re b/src/EmitJs.re
@@ -139,10 +139,10 @@ let typeNameIsInterface =
     | _ => false
     };
   switch (exportTypeMap |> StringMap.find(typeName)) {
-  | {typ} => typ |> typIsInterface
+  | {typ, _} => typ |> typIsInterface
   | exception Not_found =>
     switch (exportTypeMapFromOtherFiles |> StringMap.find(typeName)) {
-    | {typ} => typ |> typIsInterface
+    | {typ,_} => typ |> typIsInterface
     | exception Not_found => false
     }
   };

diff --git a/src/TranslateStructure.re b/src/TranslateStructure.re
@@ -6,7 +6,7 @@ let rec addAnnotationsToTyps = (expr: Typedtree.expression, typs: list(typ)) =>
     let (fields1, nextTyps1) =
       addAnnotationsToFields(expr, fields, nextTyps);
     [GroupOfLabeledArgs(fields1), ...nextTyps1];
-  | (Texp_function(_lbl, [{c_rhs}], _), [typ, ...nextTyps]) =>
+  | (Texp_function(_lbl, [{c_rhs, _}], _), [typ, ...nextTyps]) =>
     let nextTyps1 = addAnnotationsToTyps(c_rhs, nextTyps);
     [typ, ...nextTyps1];
   | _ => typs
@@ -15,7 +15,7 @@ and addAnnotationsToFields =
     (expr: Typedtree.expression, fields: fields, typs: list(typ)) =>
   switch (expr.exp_desc, fields, typs) {
   | (_, [], _) => ([], addAnnotationsToTyps(expr, typs))
-  | (Texp_function(_lbl, [{c_rhs}], _), [field, ...nextFields], _) =>
+  | (Texp_function(_lbl, [{c_rhs, _}], _), [field, ...nextFields], _) =>
     let genTypeAsPayload =
       expr.exp_attributes
       |> Annotation.getAttributePayload(Annotation.tagIsGenTypeAs);