From d3021bd5e3b5e15c74164484f92a775aec651d5d Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Wed, 19 Feb 2020 13:18:37 -0800
Subject: [PATCH 1/2] Do not `open Result` to clean up internal code

Might help with resolving https://github.com/janestreet/result/pull/9
---
 .travis.yml      |  2 +-
 CHANGES.md       |  1 +
 ocaml_version.ml | 18 ++++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62957ea..d54bdb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: c
 script: bash -ex ./.docker-run.sh
 env:
   global:
-  - OCAML_VERSIONS="4.02 4.03 4.04 4.05 4.06 4.07"
+  - OCAML_VERSIONS="4.02 4.03 4.04 4.05 4.06 4.07 4.08 4.09"
   matrix:
   - DISTRO="debian-stable"
   - DISTRO="alpine"
diff --git a/CHANGES.md b/CHANGES.md
index 838443d..dea6156 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 * Add `unreleased_betas` list to enumerate the latest release-candidate
   version for each unreleased minor OCaml series.
+* Do not `open Result` to clean up internal code.
 
 ## v2.3.0 (2019-08-29)
 
diff --git a/ocaml_version.ml b/ocaml_version.ml
index fe8e303..5fce823 100644
--- a/ocaml_version.ml
+++ b/ocaml_version.ml
@@ -14,8 +14,6 @@
  *
 *)
 
-open Result
-
 type t = { major: int; minor: int; patch: int option; extra: string option }
 let v ?patch ?extra major minor = { major; minor; patch; extra }
 
@@ -44,7 +42,7 @@ let parse s =
     end
 
 let of_string s =
-  try Ok (parse s) with
+  try Result.Ok (parse s) with
   | _ -> Error (`Msg (Printf.sprintf "Unable to parse OCaml version '%s'" s))
 
 let of_string_exn s =
@@ -152,16 +150,16 @@ let string_of_arch = function
   | `Ppc64le -> "ppc64le"
 
 let arch_of_string = function
-  | "arm64" | "aarch64" -> Ok `Aarch64
-  | "amd64" | "x86_64" -> Ok `X86_64
-  | "arm32" | "arm32v7" | "aarch32" -> Ok `Aarch32
-  | "ppc64le" -> Ok `Ppc64le
-  | arch -> Error (`Msg ("Unknown architecture " ^ arch))
+  | "arm64" | "aarch64" -> Result.Ok `Aarch64
+  | "amd64" | "x86_64" -> Result.Ok `X86_64
+  | "arm32" | "arm32v7" | "aarch32" -> Result.Ok `Aarch32
+  | "ppc64le" -> Result.Ok `Ppc64le
+  | arch -> Result.Error (`Msg ("Unknown architecture " ^ arch))
 
 let arch_of_string_exn a =
   match arch_of_string a with
-  | Ok a -> a
-  | Error (`Msg m) -> raise (Invalid_argument m)
+  | Result.Ok a -> a
+  | Result.Error (`Msg m) -> raise (Invalid_argument m)
 
 module Since = struct
   let bytes = Releases.v4_03_0

From 1b541e2f4aa10a6176e176b92e668123929b6b3c Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Thu, 20 Feb 2020 09:05:07 -0800
Subject: [PATCH 2/2] remove travis, as ocaml-ci is working great

---
 .docker-run.sh |  5 -----
 .docker.sh     | 25 -------------------------
 .travis.yml    | 12 ------------
 3 files changed, 42 deletions(-)
 delete mode 100755 .docker-run.sh
 delete mode 100755 .docker.sh
 delete mode 100644 .travis.yml

diff --git a/.docker-run.sh b/.docker-run.sh
deleted file mode 100755
index bd65d5f..0000000
--- a/.docker-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-DISTRO=${DISTRO:-alpine}
-OCAML_VERSIONS=${OCAML_VERSIONS:4.03 4.04 4.05 4.06 4.07}
-docker run -it -e DISTRO=${DISTRO} -e OCAML_VERSIONS="${OCAML_VERSIONS}" -v `pwd`:/home/opam/src ocaml/opam2:${DISTRO} /home/opam/src/.docker.sh
diff --git a/.docker.sh b/.docker.sh
deleted file mode 100755
index e105e20..0000000
--- a/.docker.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-DISTRO=${DISTRO:-alpine}
-VERSIONS=${OCAML_VERSIONS:-4.04 4.05 4.06 4.07}
-
-set -ex
-case $DISTRO in
-alpine-*) sudo apk add m4 ;;
-debian-*) sudo apt -y install m4 pkg-config ;;
-ubuntu-*) sudo apt -y install m4 pkg-config ;;
-esac
-
-sudo chown -R opam /home/opam/src
-cd /home/opam/src
-export OPAMYES=1
-export OPAMJOBS=3
-opam install --deps-only .
-rm -f jbuild-workspace.dev
-echo "(lang dune 1.0)" > jbuild-workspace.dev
-for v in $VERSIONS; do
-  echo "(context (opam (switch $v)))" >> jbuild-workspace.dev
-  opam install --deps-only -t --switch $v .
-done
-
-dune build --workspace jbuild-workspace.dev
-rm -f jbuild-workspace.dev
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d54bdb6..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-sudo: required
-services:
-  - docker
-language: c
-script: bash -ex ./.docker-run.sh
-env:
-  global:
-  - OCAML_VERSIONS="4.02 4.03 4.04 4.05 4.06 4.07 4.08 4.09"
-  matrix:
-  - DISTRO="debian-stable"
-  - DISTRO="alpine"
-  - DISTRO="ubuntu"