Merge pull request #109 from inhabitedtype/safe-string

safe-string compatibility
inhabitedtype · Nov 23, 2017 · 5ff14f4 · 5ff14f4
2 parents 98b7cbb + db74f5d
commit 5ff14f4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,22 +8,19 @@ env:
   global:
   - PINS="angstrom-async:. angstrom-lwt-unix:. angstrom-unix:. angstrom:."
   matrix:
-  - PACKAGE="angstrom" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
-  - PACKAGE="angstrom-async" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
-  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
-  - PACKAGE="angstrom-unix" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2"
-  - PACKAGE="angstrom" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom-async" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom-lwt-unix" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom-unix" DISTRO="alpine-3.5" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom-async" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom"          DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06.0"
+  - PACKAGE="angstrom-async"    DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06.0"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06.0"
+  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06.0"
+  - PACKAGE="angstrom"          DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-async"    DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom-unix"     DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04.2"
+  - PACKAGE="angstrom"          DISTRO="alpine-3.5"      OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-async"    DISTRO="alpine-3.5"      OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-lwt-unix" DISTRO="alpine-3.5"      OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-unix"     DISTRO="alpine-3.5"      OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom"          DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
+  - PACKAGE="angstrom-async"    DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
   - PACKAGE="angstrom-lwt-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
-  - PACKAGE="angstrom-unix" DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6ee5059c7420709f4ad1
-    on_success: change
-    on_failure: always
-    on_start: false
+  - PACKAGE="angstrom-unix"     DISTRO="debian-unstable" OCAML_VERSION="4.03.0"
diff --git a/async/jbuild b/async/jbuild
@@ -1,7 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name angstrom_async)
+ ((name        angstrom_async)
   (public_name angstrom-async)
   (wrapped false)
-  (libraries (angstrom async))))
+  (flags (:standard -safe-string))
+  (libraries (angstrom async))))
diff --git a/lib/jbuild b/lib/jbuild
@@ -7,6 +7,7 @@
     (bigarray
      result))
   (c_names (bigstring_stubs))
+  (flags (:standard -safe-string))
   (js_of_ocaml (
     (javascript_files (runtime.js))
     ))

diff --git a/lwt/angstrom_lwt_unix.ml b/lwt/angstrom_lwt_unix.ml
@@ -41,7 +41,7 @@ let parse ?(pushback=default_pushback) p in_chan =
   let bytes = Bytes.create size in
   let rec loop = function
     | Partial k ->
-      Lwt_io.read_into in_chan (Bytes.unsafe_to_string bytes) 0 size
+      Lwt_io.read_into in_chan bytes 0 size
       >|= begin function
         | 0   -> k `Eof
         | len ->

diff --git a/lwt/jbuild b/lwt/jbuild
@@ -1,7 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name angstrom_lwt_unix)
+ ((name        angstrom_lwt_unix)
   (public_name angstrom-lwt-unix)
   (wrapped false)
-  (libraries (angstrom lwt.unix))))
+  (flags (:standard -safe-string))
+  (libraries (angstrom lwt.unix))))