Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolve rebase conflicts for real

  • Loading branch information...
commit f961562be76401718b66e8f33a82df95e3091548 1 parent 3ec8a93
@alavrik authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 piqi-tools/piqi_of_proto.ml
  2. +2 −2 piqic/piqic_erlang_types.ml
View
4 piqi-tools/piqi_of_proto.ml
@@ -106,7 +106,7 @@ module Idtable =
(* basename + chop all extensions + underscores to dashes *)
let basename = Filename.basename file in
let basename = Piqi_file.chop_all_extensions basename in
- underscores_to_dashes basename
+ U.underscores_to_dashes basename
in
import_name ^ "/" ^ piqi_name
@@ -490,7 +490,7 @@ let gen_local_modname filename =
let name = Piqi_name.get_local_name modname in
(* import name is mandatory when modname contain underscores *)
let is_optional = not (String.contains name '_') in
- underscores_to_dashes name, is_optional
+ U.underscores_to_dashes name, is_optional
let name_imports idtable filenames =
View
4 piqic/piqic_erlang_types.ml
@@ -185,8 +185,8 @@ let gen_record_type r =
let gen_option o =
let open Option in
match o.erlang_name, o.piqtype with
- | None, Some ((`variant v) as t) | None, Some ((`enum v) as t) ->
- ios_gen_out_piqtype def
+ | None, Some ((`variant _) as t) | None, Some ((`enum _) as t) ->
+ ios_gen_out_piqtype t
| _, Some t ->
let n = erlname_of_option o in
iol [
Please sign in to comment.
Something went wrong with that request. Please try again.