Add ppx_compare to provide comparison functions for Response.t

cohttp.opam

@@ -41,6 +41,8 @@ depends: [
   "sexplib0"
   "ppx_fields_conv" {>= "v0.9.0"}
   "ppx_sexp_conv" {>= "v0.13.0"}
+  "ppx_compare" {>= "v0.13.0"}
+  "stdlib-shims"
   "stringext"
   "base64" {>= "3.1.0"}
   "stdlib-shims"

cohttp/scripts/generate.ml

@@ -193,7 +193,7 @@ let output_type oc ~mli t =
       else
         append oc "  | %s%s" c.constr doc
     ) t.codes;
-  append oc "  ] [@@deriving sexp]";
+  append oc "  ] [@@deriving compare, sexp]";
   if mli then
     append oc "(** %s *)" (String.capitalize_ascii t.section);
   append oc ""
@@ -202,9 +202,10 @@ let output_status_types oc ~mli t =
   List.iter (output_type oc ~mli) t;
   append oc "type status = [";
   List.iter (fun t -> append oc "  | %s_status" t.section) t;
-  append oc "] [@@deriving sexp]";
+  append oc "] [@@deriving compare, sexp]";
   append oc "";
-  append oc "type status_code = [`Code of int | status ] [@@deriving sexp]";
+  if not mli then append oc "let compare_int = Int.compare\n" else ();
+  append oc "type status_code = [`Code of int | status ] [@@deriving compare, sexp]";
   append oc ""
 
 let iter fn s =
@@ -296,7 +297,7 @@ let output_gen_types oc (_name, typ, gens) =
   append oc "type %s = [" typ;
   List.iter (fun { constr; _ } -> append oc "  | %s" constr) gens;
   append oc "  | `Other of string";
-  append oc "] [@@deriving sexp]";
+  append oc "] [@@deriving compare, sexp]";
   append oc ""
 
 let output_gen_convert oc ~mli (name, typ, gens) =
@@ -360,6 +361,7 @@ let meth = ("method", "meth", known_methods)
 let gen oc ~mli =
   append oc "(* Auto-Generated by 'ocaml generate.ml' *)";
   append oc "open! Sexplib0.Sexp_conv";
+  if not mli then append oc "open Ppx_compare_lib.Builtin";
   append oc "";
   output_gen_types oc version;
   output_gen_types oc meth;

cohttp/src/dune

@@ -18,9 +18,9 @@
  (public_name cohttp)
  (synopsis "Co-operative Client/Server HTTP library.")
  (preprocess
-  (pps ppx_fields_conv ppx_sexp_conv))
- (libraries re stringext uri uri-sexp fieldslib sexplib0 bytes base64
-   stdlib-shims))
+  (pps ppx_compare ppx_fields_conv ppx_sexp_conv))
+ (libraries ppx_compare.runtime-lib re stringext uri uri-sexp fieldslib
+   sexplib0 bytes base64 stdlib-shims))
 
 (ocamllex accept_lexer)
 

cohttp/src/request.ml

@@ -14,6 +14,7 @@
  *
   }}}*)
 
+open Ppx_compare_lib.Builtin
 open Sexplib0.Sexp_conv
 
 type t = {
@@ -23,7 +24,7 @@ type t = {
   resource: string;
   version: Code.version;
   encoding: Transfer.encoding;
-} [@@deriving fields, sexp]
+} [@@deriving compare, fields, sexp]
 
 let fixed_zero = Transfer.Fixed Int64.zero
 

cohttp/src/response.ml

@@ -16,13 +16,15 @@
 
 open Sexplib0.Sexp_conv
 
+let compare_bool = Bool.compare
+
 type t = {
   encoding: Transfer.encoding;
   headers: Header.t;
   version: Code.version;
   status: Code.status_code;
   flush: bool;
-} [@@deriving fields, sexp]
+} [@@deriving compare, fields, sexp]
 
 let make ?(version=`HTTP_1_1) ?(status=`OK) ?(flush=false) ?(encoding=Transfer.Chunked) ?(headers=Header.init ()) () =
   let encoding =

cohttp/src/s.ml

@@ -88,7 +88,7 @@ module type Request = sig
     resource: string;         (** Request path and query *)
     version: Code.version; (** HTTP version, usually 1.1 *)
     encoding: Transfer.encoding; (** transfer encoding of this HTTP request *)
-  } [@@deriving fields, sexp]
+  } [@@deriving compare, fields, sexp]
 
   val make : ?meth:Code.meth -> ?version:Code.version ->
     ?encoding:Transfer.encoding -> ?headers:Header.t ->
@@ -112,7 +112,7 @@ module type Response = sig
     version: Code.version; (** (** HTTP version, usually 1.1 *) *)
     status: Code.status_code; (** HTTP status code of the response *)
     flush: bool;
-  } [@@deriving fields, sexp]
+  } [@@deriving compare, fields, sexp]
 
   (* The response creates by [make ~encoding ~headers ()] has an
      encoding value determined from the content of [headers] or if no

cohttp/src/transfer.ml

@@ -16,10 +16,13 @@
 
 open Sexplib0.Sexp_conv
 
+let compare_int64 = Int64.compare
+
 type encoding =
   | Chunked
   | Fixed of int64
-  | Unknown [@@deriving sexp]
+  | Unknown
+[@@deriving compare, sexp]
 
 type chunk =
   | Chunk of string

cohttp/src/transfer.mli

@@ -24,7 +24,7 @@ type encoding =
   | Chunked             (** dynamic chunked encoding *)
   | Fixed of int64      (** fixed size content *)
   | Unknown             (** unknown body size, which leads to best-effort *)
-[@@deriving sexp]
+[@@deriving compare, sexp]
 
 (** A chunk of body that also signals if there to more to arrive *)
 type chunk =