From ab1da5bc51c13ab4a474cfaa7ca6dff64996bf79 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Thu, 31 Aug 2017 15:59:35 +0200
Subject: CWarnings.normalize_flags: removed unused ~silent argument.

---
 lib/cWarnings.ml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/cWarnings.ml b/lib/cWarnings.ml
index fda25a0a60..0cf989e494 100644
--- a/lib/cWarnings.ml
+++ b/lib/cWarnings.ml
@@ -120,7 +120,7 @@ let uniquize_flags_rev flags =
 
 (** [normalize_flags] removes redundant warnings. Unknown warnings are kept
     because they may be declared in a plugin that will be linked later. *)
-let normalize_flags ~silent warnings =
+let normalize_flags warnings =
   let warnings = cut_before_all_rev warnings in
   uniquize_flags_rev warnings
 
@@ -130,7 +130,7 @@ let normalize_flags_string s =
   if is_none_keyword s then s
   else
     let flags = flags_of_string s in
-    let flags = normalize_flags ~silent:false flags in
+    let flags = normalize_flags flags in
     string_of_flags flags
 
 let parse_warnings items =
@@ -146,7 +146,7 @@ let parse_flags s =
   else begin
       Flags.make_warn true;
       let flags = flags_of_string s in
-      let flags = normalize_flags ~silent:true flags in
+      let flags = normalize_flags flags in
       parse_warnings flags;
       string_of_flags flags
     end
-- 
cgit v1.2.3


From 461bdc02eb7e879fac3217e127e565b2623aec45 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Thu, 31 Aug 2017 16:04:18 +0200
Subject: Util.Empty: implement using polymorphic record.

---
 lib/util.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/util.ml b/lib/util.ml
index 7d7d380b26..38d73d3453 100644
--- a/lib/util.ml
+++ b/lib/util.ml
@@ -38,8 +38,8 @@ let is_blank = function
 
 module Empty =
 struct
-  type t
-  let abort (x : t) = assert false
+  type t = { abort : 'a. 'a }
+  let abort (x : t) = x.abort
 end
 
 (* Strings *)
-- 
cgit v1.2.3