Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1b80a84a4c6e
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2989f13a71cb
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 20, 2018

  1. Copy the full SHA
    b84dbcd View commit details

Commits on Dec 27, 2018

  1. Merge pull request #957 from hannesm/no-astring

    Use String.split_on_char instead of Astring in mirage-runtime
    avsm authored Dec 27, 2018
    Copy the full SHA
    2989f13 View commit details
Showing with 5 additions and 6 deletions.
  1. +1 −1 lib_runtime/dune
  2. +4 −4 lib_runtime/mirage_runtime.ml
  3. +0 −1 mirage-runtime.opam
2 changes: 1 addition & 1 deletion lib_runtime/dune
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
(name mirage_runtime)
(public_name mirage-runtime)
(wrapped false)
(libraries functoria-runtime ipaddr astring logs fmt))
(libraries functoria-runtime ipaddr logs fmt))
8 changes: 4 additions & 4 deletions lib_runtime/mirage_runtime.ml
Original file line number Diff line number Diff line change
@@ -87,10 +87,10 @@ module Arg = struct
with Not_found -> "warning"
in
let parser str =
match Astring.String.cut ~sep:":" str with
| None -> `Ok (`All , level_of_string str)
| Some ("*", str) -> `Ok (`All , level_of_string str)
| Some (src, str) -> `Ok (`Src src, level_of_string str)
match String.split_on_char ':' str with
| [] -> `Ok (`All, level_of_string str)
| [ src ; lvl ] -> `Ok (`Src src, level_of_string lvl)
| _ -> `Error ("Can't parse log threshold: "^str)
in
let serialize ppf = function
| `All , l -> Fmt.string ppf (string_of_level l)
1 change: 0 additions & 1 deletion mirage-runtime.opam
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ depends: [
"ipaddr" {>= "2.6.0"}
"functoria-runtime" {>= "2.2.2"}
"fmt"
"astring"
"logs"
]
synopsis: "The base MirageOS runtime library, part of every MirageOS unikernel"