.gitignore

-_build/
-/setup.data
-/setup.log
-/*.exe
-/*.docdir
-/*.native
-/*.byte
+_build
+*.install
+*.merlin
+

CHANGES.md

+## 113.43.00
+
+- Change `typerep_lib` to use the type `lazy_t` rather than `Lazy.t`.  The
+  ocaml_plugin library's `Ocaml_compiler` compiles modules in an
+  environment where the compiler cannot determine that `Lazy.t` and `lazy_t`
+  are the same - thus with the current version of typerep_lib plugins
+  effectively cannot use `@@deriving typerep`.
+
 ## 113.24.00
 
 - Add whether record fields are mutable.

CONTRIBUTING.md

+This repository contains open source software that is developed and
+maintained by [Jane Street][js].
+
+Contributions to this project are welcome and should be submitted via
+GitHub pull requests.
+
+Signing contributions
+---------------------
+
+We require that you sign your contributions. Your signature certifies
+that you wrote the patch or otherwise have the right to pass it on as
+an open-source patch. The rules are pretty simple: if you can certify
+the below (from [developercertificate.org][dco]):
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+Then you just add a line to every git commit message:
+
+```
+Signed-off-by: Joe Smith <joe.smith@email.com>
+```
+
+Use your real name (sorry, no pseudonyms or anonymous contributions.)
+
+If you set your `user.name` and `user.email` git configs, you can sign
+your commit automatically with git commit -s.
+
+[dco]: http://developercertificate.org/
+[js]: https://opensource.janestreet.com/

INRIA-DISCLAIMER.txt

-THIS SOFTWARE IS PROVIDED BY INRIA AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INRIA OR ITS CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

LICENSE.md

+The MIT License
+
+Copyright (c) 2013--2019 Jane Street Group, LLC <opensource@janestreet.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.txt

-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

META.ab

-version = "$(pkg_version)"
-description = "typerep is a library for runtime types."
-requires = ""
-archive(byte          ) = "typerep_lib.cma"
-archive(native        ) = "typerep_lib.cmxa"
-archive(native, plugin) = "typerep_lib.cmxs"
-exists_if = "typerep_lib.cma"

Makefile

-# Generic Makefile for oasis project
+INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
-SETUP := setup.exe
-NAME := typerep
-PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2)
+default:
+	dune build
 
-# Default rule
-default: build
+install:
+	dune install $(INSTALL_ARGS)
 
-setup.exe: _oasis setup.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || \
-	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup.ml || true
-	for f in setup.*; do [ $$f = $@ -o $$f = setup.ml ] || rm -f $$f; done
+uninstall:
+	dune uninstall $(INSTALL_ARGS)
 
-build: $(SETUP) setup.data
-	./$(SETUP) -build $(BUILDFLAGS)
-	$(MAKE) $(NAME).install
+reinstall: uninstall install
 
-doc: $(SETUP) setup.data build
-	./$(SETUP) -doc $(DOCFLAGS)
+clean:
+	dune clean
 
-test: $(SETUP) setup.data build
-	./$(SETUP) -test $(TESTFLAGS)
-
-all: $(SETUP)
-	./$(SETUP) -all $(ALLFLAGS)
-	$(MAKE) $(NAME).install
-
-$(NAME).install: js-utils/gen_install.ml setup.log setup.data
-	ocaml -I js-utils js-utils/gen_install.ml
-
-install: $(NAME).install
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
-
-uninstall: $(NAME).install
-	opam-installer -u --prefix $(PREFIX) $(NAME).install
-
-reinstall: $(NAME).install
-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
-
-bin.tar.gz: $(NAME).install
-	rm -rf _install
-	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
-	tar czf bin.tar.gz -C _install .
-	rm -rf _install
-
-bin.lzo: $(NAME).install
-	rm -rf _install
-	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
-	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
-	rm -rf _install
-
-clean: $(SETUP)
-	./$(SETUP) -clean $(CLEANFLAGS)
-
-distclean: $(SETUP)
-	./$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-configure: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: default build doc test all install uninstall reinstall clean distclean configure
+.PHONY: default install uninstall reinstall clean

THIRD-PARTY.txt

-The repository contains 3rd-party code in the following locations and
-under the following licenses:
-
-- type_conv, sexplib and bin_prot: based on Tywith, by Martin
-  Sandin.  License can be found in base/sexplib/LICENSE-Tywith.txt,
-  base/type_conv/LICENSE-Tywith.txt, and base/bin_prot/LICENSE-Tywith.txt.
-
-- Core's implementation of union-find: based on an implementation by
-  Henry Matthew Fluet, Suresh Jagannathan, and Stephen Weeks. License
-  can be found in base/core/MLton-license.
-
-- Various Core libraries are based on INRIA's OCaml
-  distribution. Relicensed under Apache 2.0, as permitted under the
-  Caml License for Consortium members:
-
-     http://caml.inria.fr/consortium/license.en.html
-
-  See also the disclaimer INRIA-DISCLAIMER.txt.

_oasis

-OASISFormat:      0.4
-OCamlVersion:     >= 4.02.3
-FindlibVersion:   >= 1.3.2
-Name:             typerep
-Version:          113.24.00
-Synopsis:         typerep is a library for runtime types.
-Authors:          Jane Street Group, LLC <opensource@janestreet.com>
-Copyrights:       (C) 2013-2016 Jane Street Group LLC <opensource@janestreet.com>
-Maintainers:      Jane Street Group, LLC <opensource@janestreet.com>
-License:          Apache-2.0
-LicenseFile:      LICENSE.txt
-Homepage:         https://github.com/janestreet/typerep
-Plugins:          StdFiles (0.3), DevFiles (0.3), META (0.3)
-XStdFilesAUTHORS: false
-XStdFilesREADME:  false
-BuildTools:       ocamlbuild
-FilesAB:          META.ab
-
-Library typerep_lib
-  Path:    lib
-  Pack:    true
-  Modules: Make_typename,
-           Named_intf,
-           Std,
-           Std_internal,
-           Type_abstract,
-           Type_equal,
-           Type_generic,
-           Type_generic_intf,
-           Typename,
-           Typerep_obj,
-           Typerepable,
-           Variant_and_record_intf

_tags

-<**/*.ml{,i}>: warn(-40), no_alias_deps
-<**/*>: thread
-# This prevents the implicit addition of -ppx options by ocamlfind
-<**/*.ml{,i}>: predicate(ppx_driver)
-<lib/*.ml>: for-pack(Typerep_lib)
-# OASIS_START
-# OASIS_STOP

configure

-#!/bin/sh
-
-# OASIS_START
-make configure CONFIGUREFLAGS="$*"
-# OASIS_STOP

descr

-typerep is a library for runtime types.

dune-project

+(lang dune 1.5)
\ No newline at end of file

js-utils/gen_install.ml

-(* Generate <package>.install from setup.log *)
-
-#use "install_tags.ml"
-
-module String_map = Map.Make(String)
-let string_map_of_list =
-  List.fold_left
-    (fun acc (k, v) ->
-       assert (not (String_map.mem k acc));
-       String_map.add k v acc)
-    String_map.empty
-
-let lines_of_file fn =
-  let ic = open_in fn in
-  let rec loop acc =
-    match input_line ic with
-    | exception End_of_file ->
-      close_in ic;
-      List.rev acc
-    | line ->
-      loop (line :: acc)
-  in
-  loop []
-
-let read_setup_log () =
-  lines_of_file "setup.log"
-  |> List.map (fun line -> Scanf.sscanf line "%S %S" (fun tag arg -> (tag, arg)))
-
-let read_setup_data () =
-  lines_of_file "setup.data"
-  |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v)))
-
-let remove_cwd =
-  let prefix = Sys.getcwd () ^ "/" in
-  let len_prefix = String.length prefix in
-  fun fn ->
-    let len = String.length fn in
-    if len >= len_prefix && String.sub fn 0 len_prefix = prefix then
-      String.sub fn len_prefix (len - len_prefix)
-    else
-      fn
-
-let gen_section oc name files =
-  let pr fmt = Printf.fprintf oc (fmt ^^ "\n") in
-  pr "%s: [" name;
-  List.iter
-    (fun (src, dst) ->
-       let src = remove_cwd src in
-       let dst =
-         match dst with
-         | None -> Filename.basename src
-         | Some fn -> fn
-       in
-       if src = dst then
-         pr "  %S" src
-       else
-         pr "  %S {%S}" src dst)
-    files;
-  pr "]"
-
-let rec filter_log tags log acc =
-  match log with
-  | [] -> acc
-  | (tag, fname) :: rest ->
-    match String_map.find tag tags with
-    | exception Not_found -> filter_log tags rest acc
-    | dst -> filter_log tags rest ((fname, dst) :: acc)
-
-let () =
-  let log = read_setup_log () in
-  let setup_data = read_setup_data () in
-  let ext_dll =
-    match List.assoc "ext_dll" setup_data with
-    | ext -> ext
-    | exception Not_found -> ".so"
-  in
-  let merge name files map =
-    match String_map.find name map with
-    | files' -> String_map.add name (files @ files') map
-    | exception Not_found -> String_map.add name files map
-  in
-  let sections =
-    List.fold_left
-      (fun acc (name, tags, extra_files) ->
-         let tags = string_map_of_list tags in
-         let files = filter_log tags log [] @ extra_files in
-         if name = "lib" then
-           let stubs, others =
-             List.partition
-               (fun (fn, _) -> Filename.check_suffix fn ext_dll)
-               files
-           in
-           merge "lib" others (merge "stublibs" stubs acc)
-         else
-           merge name files acc)
-      String_map.empty sections
-    |> String_map.bindings
-    |> List.filter (fun (_, l) -> l <> [])
-  in
-  let oc = open_out (package_name ^ ".install") in
-  List.iter (fun (name, files) -> gen_section oc name files) sections;
-  close_out oc

js-utils/install_tags.ml

-let package_name = "typerep"
-
-let sections =
-  [ ("lib",
-    [ ("built_lib_typerep_lib", None)
-    ],
-    [ ("META", None)
-    ])
-  ]

lib/dune

+(library (name typerep_lib) (public_name typerep)
+ (preprocess no_preprocessing) (libraries base))
\ No newline at end of file

lib/std_internal.ml

@@ -30,6 +30,10 @@ module Name_of = struct
     let module M = Typename.Make0(struct type t = string let name = "string" end) in
     M.typename_of_t
 
+  let typename_of_bytes =
+    let module M = Typename.Make0(struct type t = bytes let name = "bytes" end) in
+    M.typename_of_t
+
   let typename_of_bool =
     let module M = Typename.Make0(struct type t = bool let name = "bool" end) in
     M.typename_of_t
@@ -98,18 +102,19 @@ module rec Typerep : sig
     | Char       : char t
     | Float      : float t
     | String     : string t
+    | Bytes      : bytes t
     | Bool       : bool t
     | Unit       : unit t
     | Option     : 'a t -> 'a option t
     | List       : 'a t -> 'a list t
     | Array      : 'a t -> 'a array t
-    | Lazy       : 'a t -> 'a Lazy.t t
+    | Lazy       : 'a t -> 'a lazy_t t
     | Ref        : 'a t -> 'a ref t
     | Function   : ('dom t * 'rng t) -> ('dom -> 'rng) t
     | Tuple      : 'a Typerep.Tuple.t -> 'a t
     | Record     : 'a Typerep.Record.t -> 'a t
     | Variant    : 'a Typerep.Variant.t -> 'a t
-    | Named      : ('a Typerep.Named.t * 'a t Lazy.t option) -> 'a t
+    | Named      : ('a Typerep.Named.t * 'a t lazy_t option) -> 'a t
 
   type packed = T : 'a t -> packed
 
@@ -239,18 +244,19 @@ end = struct
     | Char : char t
     | Float : float t
     | String : string t
+    | Bytes : bytes t
     | Bool : bool t
     | Unit : unit t
     | Option : 'a t -> 'a option t
     | List : 'a t -> 'a list t
     | Array : 'a t -> 'a array t
-    | Lazy : 'a t -> 'a Lazy.t t
+    | Lazy : 'a t -> 'a lazy_t t
     | Ref : 'a t -> 'a ref t
     | Function : ('dom t * 'rng t) -> ('dom -> 'rng) t
     | Tuple : 'a Typerep.Tuple.t -> 'a t
     | Record : 'a Typerep.Record.t -> 'a t
     | Variant : 'a Typerep.Variant.t -> 'a t
-    | Named : ('a Typerep.Named.t * 'a t Lazy.t option) -> 'a t
+    | Named : ('a Typerep.Named.t * 'a t lazy_t option) -> 'a t
 
   type packed = T : 'a t -> packed
 
@@ -427,6 +433,7 @@ end = struct
     | Char       -> Name_of.typename_of_char
     | Float      -> Name_of.typename_of_float
     | String     -> Name_of.typename_of_string
+    | Bytes      -> Name_of.typename_of_bytes
     | Bool       -> Name_of.typename_of_bool
     | Unit       -> Name_of.typename_of_unit
 
@@ -479,6 +486,7 @@ end = struct
     | Char      , Char       -> Some E.T
     | Float     , Float      -> Some E.T
     | String    , String     -> Some E.T
+    | Bytes     , Bytes      -> Some E.T
     | Bool      , Bool       -> Some E.T
     | Unit      , Unit       -> Some E.T
     | Option r1, Option r2 -> begin
@@ -581,6 +589,7 @@ end = struct
     | Char, _        -> None
     | Float, _       -> None
     | String, _      -> None
+    | Bytes, _       -> None
     | Bool, _        -> None
     | Unit, _        -> None
     | Option _, _    -> None
@@ -612,6 +621,7 @@ let typerep_of_nativeint  = Typerep.Nativeint
 let typerep_of_char       = Typerep.Char
 let typerep_of_float      = Typerep.Float
 let typerep_of_string     = Typerep.String
+let typerep_of_bytes      = Typerep.Bytes
 let typerep_of_bool       = Typerep.Bool
 let typerep_of_unit       = Typerep.Unit
 

lib/std_internal.mli

@@ -11,12 +11,13 @@ module rec Typerep : sig
   | Char       : char t
   | Float      : float t
   | String     : string t
+  | Bytes      : bytes t
   | Bool       : bool t
   | Unit       : unit t
   | Option     : 'a t -> 'a option t
   | List       : 'a t -> 'a list t
   | Array      : 'a t -> 'a array t
-  | Lazy       : 'a t -> 'a Lazy.t t
+  | Lazy       : 'a t -> 'a lazy_t t
   | Ref        : 'a t -> 'a ref t
   | Function   : ('dom t * 'rng t) -> ('dom -> 'rng) t
   | Tuple      : 'a Typerep.Tuple.t -> 'a t
@@ -25,7 +26,7 @@ module rec Typerep : sig
     (** The [Named] constructor both allows for custom implementations of generics
         based on name and provides a way to represent recursive types, the lazy
         part dealing with cycles *)
-  | Named      : ('a Typerep.Named.t * 'a t Lazy.t option) -> 'a t
+  | Named      : ('a Typerep.Named.t * 'a t lazy_t option) -> 'a t
 
   type packed = T : 'a t -> packed
 
@@ -140,7 +141,7 @@ module rec Typerep : sig
       example put in a list together.
       It is worth noting that this function *does not* operate compatiblity diffs between
       two different types with the same structure. Example:
-      {|
+      {[
         module M1 = struct
           type t = {
             a : int;
@@ -158,9 +159,8 @@ module rec Typerep : sig
         type a = int with typerep
         type b = int with typerep
         TEST = same typerep_of_a typerep_of_b
-      |}
+      ]}
       This is meant to recover type equality hidden by existential constructors.
-      For a deeper introspection of the structure, [see Type_struct].
 
       Basically this function does structural equality for everything except variant
       types, record types, and named types with no lazy definition exposed. This last case
@@ -185,6 +185,7 @@ val typerep_of_nativeint  : nativeint Typerep.t
 val typerep_of_char       : char      Typerep.t
 val typerep_of_float      : float     Typerep.t
 val typerep_of_string     : string    Typerep.t
+val typerep_of_bytes      : bytes     Typerep.t
 val typerep_of_bool       : bool      Typerep.t
 val typerep_of_unit       : unit      Typerep.t
 
@@ -220,6 +221,7 @@ val typename_of_nativeint  : nativeint Typename.t
 val typename_of_char       : char      Typename.t
 val typename_of_float      : float     Typename.t
 val typename_of_string     : string    Typename.t
+val typename_of_bytes      : bytes     Typename.t
 val typename_of_bool       : bool      Typename.t
 val typename_of_unit       : unit      Typename.t
 

lib/type_abstract.ml

 open Std_internal
 
-module Make0 (X : Named_intf.S0) : Typerepable.S0
+module Make0 (X : Named_intf.S0) : Typerepable.S
   with type t := X.t
 = struct
   module M = Make_typename.Make0(X)