font-manager: use the option API by default

Lulzx · Jun 24, 2020 · f33cbba · f33cbba
1 parent 647daf6
commit f33cbba
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/examples/font-manager-cli/FontQuery.re b/examples/font-manager-cli/FontQuery.re
@@ -15,7 +15,7 @@ let spec = [
 
 Arg.parse(spec, _ => (), "Simple CLI utility to test findFont");
 
-FontManager.findFont(
+FontManager.findFontExn(
   ~family=fontFamily^,
   ~weight=
     isBold^ ? FontManager.FontWeight.Bold : FontManager.FontWeight.Normal,

diff --git a/src/Font/Discovery.re b/src/Font/Discovery.re
@@ -12,6 +12,6 @@ let find =
       ~italic=false,
       family,
     ) =>
-  FontManager.findFont(~weight, ~width, ~mono, ~italic, ~family, ());
+  FontManager.findFontExn(~weight, ~width, ~mono, ~italic, ~family, ());
 
 let toString = FontManager.FontDescriptor.show;
diff --git a/src/reason-font-manager/FontManager.re b/src/reason-font-manager/FontManager.re
@@ -5,7 +5,7 @@ module FontWidth = FontWidth;
 external findFont': (string, int, int, bool, bool) => FontDescriptor.raw =
   "fm_findFont";
 
-let findFontOpt =
+let findFont =
     (
       ~weight=FontWeight.Normal,
       ~width=FontWidth.Undefined,
@@ -29,7 +29,7 @@ let findFontOpt =
 };
 
 exception Font_not_found;
-let findFont =
+let findFontExn =
     (
       ~weight=FontWeight.Normal,
       ~width=FontWidth.Undefined,
@@ -38,7 +38,7 @@ let findFont =
       ~mono: bool,
       (),
     ) => {
-  switch (findFontOpt(~weight, ~width, ~family, ~italic, ~mono, ())) {
+  switch (findFont(~weight, ~width, ~family, ~italic, ~mono, ())) {
   | None => raise(Font_not_found)
   | Some(fontDescriptor) => fontDescriptor
   };

diff --git a/src/reason-font-manager/FontManager.rei b/src/reason-font-manager/FontManager.rei
@@ -12,8 +12,8 @@ let findFont:
     ~mono: bool,
     unit
   ) =>
-  FontDescriptor.t;
-let findFontOpt:
+  option(FontDescriptor.t);
+let findFontExn:
   (
     ~weight: FontWeight.t=?,
     ~width: FontWidth.t=?,
@@ -22,4 +22,4 @@ let findFontOpt:
     ~mono: bool,
     unit
   ) =>
-  option(FontDescriptor.t);
+  FontDescriptor.t;