update to OCaml 4.14.1

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 4.14.0
+          - 4.14.1
 
     runs-on: ${{ matrix.os }}
 
@@ -33,7 +33,7 @@ jobs:
           dune-cache: false
 
       - name: Install dune
-        run: opam install dune>=3.4.1
+        run: opam install dune>=3.6.1
 
       - name: Build HTML book
         run: opam exec -- dune build @site

Dockerfile

@@ -2,15 +2,15 @@ FROM ocaml/opam:ubuntu
 RUN sudo apt-get update && sudo apt-get -y install python3-pygments tzdata pandoc texlive-full
 
 # update opam
-RUN opam switch 4.13
+RUN opam switch 4.14
 RUN git -C /home/opam/opam-repository pull origin master && opam update -uy
 
 # install non-OCaml dependencies
 WORKDIR /home/opam/src
 COPY Makefile /home/opam/src/.
 COPY rwo.opam /home/opam/src/.
 RUN opam pin add -n rwo /home/opam/src && opam depext -y rwo
-RUN opam install dune=3.1.1
+RUN opam install dune=3.6.1
 
 # compile the project
 COPY . /home/opam/src/

README.md

@@ -1,10 +1,10 @@
-Real World OCaml v2
+Real World OCaml v3
 -------------------
 
-This is the source code for the Real World OCaml 2nd edition, which is
+This is the source code for the Real World OCaml 3rd edition, which is
 still a work in progress.  The original edition was written by Yaron
-Minsky, Anil Madhavapeddy and Jason Hickey, and the revised edition is
-being led by Yaron Minsky and Anil Madhavapeddy.  There have been
+Minsky, Anil Madhavapeddy and Jason Hickey, and the 2nd and subsequent
+editions are being led by Yaron Minsky and Anil Madhavapeddy.  There have been
 significant contributions to the revised tooling from Ashish Agarwal,
 Jeremy Yallop, Frederic Bour, and Sander Spies.
 
@@ -27,7 +27,7 @@ mdx is used to keep the examples and the chapter's code block in sync.
 The `bin/` folder contains the OCaml scripts used to generate the books HTML
 and PDF versions.
 
-All of the code and examples are built using OCaml 4.09.0.
+All of the code and examples are built using OCaml 4.14.1.
 
 ## Building
 
@@ -47,8 +47,8 @@ with only `dune` installed to avoid conflicts between the opam and local
 libraries. To set up your RWO development environment you can run:
 
 ```
-opam switch create rwo 4.13.1
-opam install dune=3.0.2
+opam switch create rwo 4.14.1
+opam install dune=3.6.1
 ```
 
 ### Generating the HTML

bin/bin/app.ml

@@ -1,7 +1,6 @@
 open Core
 open Async
 open Rwo
-let (/) = Filename.concat
 
 module Params = struct
   open Command.Param
@@ -11,19 +10,6 @@ module Params = struct
     let doc = sprintf "dir Root of repository. Default: \"%s\"." default in
     flag "-repo-root" (optional_with_default default string) ~doc
 
-  let production =
-    let default = false in
-    let doc = sprintf
-        " Set to true to generate file for publication. Default \
-         is %b, which generates dev version of file."
-        default
-    in
-    flag "-production" (optional_with_default default bool) ~doc
-
-  let chapter =
-    let doc = "N Build HTML version of chapter N." in
-    flag "-chapter" (required int) ~doc
-
   let out_dir =
     let default = "_build" in
     let doc = sprintf "DIR Output directory. Default: \"%s\"" default in
@@ -37,12 +23,6 @@ module Params = struct
 
   let file =
     anon ("file" %: string)
-
-  let run_nondeterministic =
-    flag "-run-nondeterministic" no_arg
-      ~doc:" In .mlt files, run code marked [%%expect.nondeterministic ...]. \
-            By default, they are skipped."
-
 end
 
 

bin/bin/convert_md.ml

@@ -138,9 +138,6 @@ let pp_block_md ppf (b:Mdx.Block.t) =
 let pp_text_html ppf l =
   List.iter (Fmt.pf ppf "%s\n") (List.rev l)
 
-let pp_text_md ppf l =
-  List.iter (Fmt.pf ppf "%s\n") (List.rev l)
-
 open Astring
 
 let pp_text_latex ppf l =

bin/examples-rules/examples_rules.ml

@@ -40,6 +40,7 @@ let print_rule ~dir_name ~path (config : Config.t) =
     {|
 (rule
  (alias %s)
+ (locks /global)
  (deps
   (source_tree %s)%s)
  (action

book/classes/README.md

@@ -145,7 +145,7 @@ Error: Some type variables are unbound in this type:
              method pop : 'b option
              method push : 'b -> unit
            end
-       The method pop has type 'a option where 'a is unbound
+       The method pop has type 'b option where 'b is unbound
 ```
 
 In general, we need to provide enough constraints so that the compiler will

book/classes/dune

@@ -1,7 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
+  async_unix
   ppx_jane)
  (preludes prelude.ml))

book/classes/examples/dune.inc

@@ -1,6 +1,7 @@
 
 (rule
  (alias shapes)
+ (locks /global)
  (deps
   (source_tree ./correct/shapes)
   (package base)

book/command-line-parsing/dune

@@ -1,7 +1,9 @@
 (mdx
  (files README.md)
- (packages
+ (locks /global)
+ (libraries
   core
+  core_unix
   mdx
   ppx_jane)
  (preludes prelude.ml))

book/command-line-parsing/examples/dune.inc

@@ -1,6 +1,7 @@
 
 (rule
  (alias cal_add_days)
+ (locks /global)
  (deps
   (source_tree ./correct/cal_add_days)
   (package core))
@@ -13,6 +14,7 @@
 
 (rule
  (alias cal_add_interactive)
+ (locks /global)
  (deps
   (source_tree ./correct/cal_add_interactive)
   (package core)
@@ -26,6 +28,7 @@
 
 (rule
  (alias cal_add_interactive2)
+ (locks /global)
  (deps
   (source_tree ./correct/cal_add_interactive2)
   (package core))
@@ -38,6 +41,7 @@
 
 (rule
  (alias cal_add_sub_days)
+ (locks /global)
  (deps
   (source_tree ./correct/cal_add_sub_days)
   (package core))
@@ -50,6 +54,7 @@
 
 (rule
  (alias md5)
+ (locks /global)
  (deps
   (source_tree ./correct/md5)
   (package core))
@@ -62,6 +67,7 @@
 
 (rule
  (alias md5_as_filename)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_as_filename)
   (package core))
@@ -74,6 +80,7 @@
 
 (rule
  (alias md5_let_syntax)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_let_syntax)
   (package core))
@@ -86,6 +93,7 @@
 
 (rule
  (alias md5_let_syntax2)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_let_syntax2)
   (package core))
@@ -98,6 +106,7 @@
 
 (rule
  (alias md5_multiarg)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_multiarg)
   (package core))
@@ -110,6 +119,7 @@
 
 (rule
  (alias md5_sequence)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_sequence)
   (package core))
@@ -122,6 +132,7 @@
 
 (rule
  (alias md5_succinct)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_succinct)
   (package core))
@@ -134,6 +145,7 @@
 
 (rule
  (alias md5_with_custom_arg)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_with_custom_arg)
   (package core))
@@ -146,6 +158,7 @@
 
 (rule
  (alias md5_with_default_file)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_with_default_file)
   (package core))
@@ -158,6 +171,7 @@
 
 (rule
  (alias md5_with_flags)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_with_flags)
   (package core))
@@ -170,6 +184,7 @@
 
 (rule
  (alias md5_with_optional_file)
+ (locks /global)
  (deps
   (source_tree ./correct/md5_with_optional_file)
   (package core))

book/compiler-backend/README.md

@@ -1050,7 +1050,7 @@ opam provides a compiler switch that compiles OCaml with the frame pointer
 activated:
 
 ```sh skip
-$ opam switch create 4.13+fp ocaml-variants.4.13.1+options ocaml-option-fp
+$ opam switch create 4.14+fp ocaml-variants.4.14.1+options ocaml-option-fp
 ```
 
 Using the frame pointer changes the OCaml calling convention, but opam takes
@@ -1111,7 +1111,7 @@ To use the debug library, just link your program with the
 $ ocamlopt -runtime-variant d -verbose -o hello.native hello.ml
 + as  -o 'hello.o' '/tmp/build_cd0b96_dune/camlasmd3c336.s'
 + as  -o '/tmp/build_cd0b96_dune/camlstartup9d55d0.o' '/tmp/build_cd0b96_dune/camlstartup2b2cd3.s'
-+ gcc -O2 -fno-strict-aliasing -fwrapv -pthread -Wall -Wdeclaration-after-statement -fno-common -fexcess-precision=standard -fno-tree-vrp -ffunction-sections  -Wl,-E  -o 'hello.native'  '-L/home/yminsky/.opam/rwo-4.13.1/lib/ocaml'  '/tmp/build_cd0b96_dune/camlstartup9d55d0.o' '/home/yminsky/.opam/rwo-4.13.1/lib/ocaml/std_exit.o' 'hello.o' '/home/yminsky/.opam/rwo-4.13.1/lib/ocaml/stdlib.a' '/home/yminsky/.opam/rwo-4.13.1/lib/ocaml/libasmrund.a' -lm -ldl
++ gcc -O2 -fno-strict-aliasing -fwrapv -pthread -Wall -Wdeclaration-after-statement -fno-common -fexcess-precision=standard -fno-tree-vrp -ffunction-sections  -Wl,-E  -o 'hello.native'  '-L/home/yminsky/.opam/rwo-4.14.1/lib/ocaml'  '/tmp/build_cd0b96_dune/camlstartup9d55d0.o' '/home/yminsky/.opam/rwo-4.14.1/lib/ocaml/std_exit.o' 'hello.o' '/home/yminsky/.opam/rwo-4.14.1/lib/ocaml/stdlib.a' '/home/yminsky/.opam/rwo-4.14.1/lib/ocaml/libasmrund.a' -lm -ldl
 $ ./hello.native
 ### OCaml runtime: debug mode ###
 Initial minor heap size: 256k words

book/compiler-backend/dune

@@ -1,8 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))
 

book/compiler-frontend/README.md

@@ -1011,10 +1011,11 @@ into a `Hello` library.
 ```sh dir=examples/packing
 $ dune build
 $ cat _build/default/hello.ml-gen
+(* generated by dune *)
+
 (** @canonical Hello.A *)
 module A = Hello__A
 
-
 (** @canonical Hello.B *)
 module B = Hello__B
 ```

book/compiler-frontend/dune

@@ -1,8 +1,7 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   core
-  mdx
   ppx_jane)
  (preludes prelude.ml))
 

book/concurrent-programming/dune

@@ -1,10 +1,11 @@
 (mdx
  (files README.md)
- (packages
+ (libraries
   async
+  async_kernel
+  async_unix
   cohttp-async
   core
-  mdx
   ppx_jane
   textwrap
   yojson)