aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2018-07-05 12:56:27 +0200
committerGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2018-07-05 12:56:27 +0200
commitd19605b7bfb8425b53be4cab30bef462c4fa4d14 (patch)
tree2bdcc15e217c24ca33b2fe48537c8632562a9ec1 /lib
parent7413f8532879c64e05ee0e8ca16693d74fe84ab9 (diff)
parent08b2fde7054a61e5468ef90eabb0d348730f170e (diff)
Merge PR #7746: Many small cleanups removing unused arguments and functions
Diffstat (limited to 'lib')
-rw-r--r--lib/cWarnings.ml6
-rw-r--r--lib/util.ml4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/cWarnings.ml b/lib/cWarnings.ml
index fda25a0a6..0cf989e49 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
diff --git a/lib/util.ml b/lib/util.ml
index 7d7d380b2..38d73d345 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 *)