balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Indentation fixes.

Browse Source
This commit is contained in:
Grégoire Henry 2017-12-07 17:43:21 +01:00 committed by Benjamin Canou
parent 154578827f
commit 375ddd48dc
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib_client_base/client_commands.mli
View File

@ -48,7 +48,6 @@ class type full_context = object
inherit block inherit block
end end
(** The [full_context] allows the client {!command} handlers to work in (** The [full_context] allows the client {!command} handlers to work in
>>>>>>> 3ab6ecd4... Client library refactor
various modes (command line, batch mode, web client, etc.) by various modes (command line, batch mode, web client, etc.) by
abstracting some basic operations such as logging and reading abstracting some basic operations such as logging and reading
configuration options. It is passed as parameter to the command configuration options. It is passed as parameter to the command

18
lib_embedded_client_alpha/michelson_macros.ml
View File

@ -375,7 +375,7 @@ let expand_compare original =
| Prim (loc, "CMPGE", [], None) -> | Prim (loc, "CMPGE", [], None) ->
cmp loc [ "COMPARE" ; "GE" ] cmp loc [ "COMPARE" ; "GE" ]
| Prim (_, ("CMPEQ" | "CMPNEQ" | "CMPLT" | Prim (_, ("CMPEQ" | "CMPNEQ" | "CMPLT"
| "CMPGT" | "CMPLE" | "CMPGE" as str), args, None) -> | "CMPGT" | "CMPLE" | "CMPGE" as str), args, None) ->
error (Invalid_arity (str, List.length args, 0)) error (Invalid_arity (str, List.length args, 0))
| Prim (loc, "IFCMPEQ", [ l ; r ], None) -> | Prim (loc, "IFCMPEQ", [ l ; r ], None) ->
ifcmp loc [ "COMPARE" ; "EQ" ] l r ifcmp loc [ "COMPARE" ; "EQ" ] l r
@ -402,16 +402,16 @@ let expand_compare original =
| Prim (loc, "IFGE", [ l ; r ], None) -> | Prim (loc, "IFGE", [ l ; r ], None) ->
ifcmp loc [ "GE" ] l r ifcmp loc [ "GE" ] l r
| Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT" | Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT"
| "IFCMPGT" | "IFCMPLE" | "IFCMPGE" | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
| "IFEQ" | "IFNEQ" | "IFLT" | "IFEQ" | "IFNEQ" | "IFLT"
| "IFGT" | "IFLE" | "IFGE" as str), args, None) -> | "IFGT" | "IFLE" | "IFGE" as str), args, None) ->
error (Invalid_arity (str, List.length args, 2)) error (Invalid_arity (str, List.length args, 2))
| Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT" | Prim (_, ("IFCMPEQ" | "IFCMPNEQ" | "IFCMPLT"
| "IFCMPGT" | "IFCMPLE" | "IFCMPGE" | "IFCMPGT" | "IFCMPLE" | "IFCMPGE"
| "IFEQ" | "IFNEQ" | "IFLT" | "IFEQ" | "IFNEQ" | "IFLT"
| "IFGT" | "IFLE" | "IFGE" | "IFGT" | "IFLE" | "IFGE"
| "CMPEQ" | "CMPNEQ" | "CMPLT" | "CMPEQ" | "CMPNEQ" | "CMPLT"
| "CMPGT" | "CMPLE" | "CMPGE" as str), [], Some _) -> | "CMPGT" | "CMPLE" | "CMPGE" as str), [], Some _) ->
error (Unexpected_macro_annotation str) error (Unexpected_macro_annotation str)
| _ -> ok None | _ -> ok None

3
lib_node_p2p/p2p.ml
View File

@ -541,7 +541,8 @@ module RPC = struct
let info net point = let info net point =
match net.pool with match net.pool with
| None -> None | None -> None
| Some pool -> Option.map | Some pool ->
Option.map
(P2p_connection_pool.Points.info pool point) (P2p_connection_pool.Points.info pool point)
~f:info_of_point_info ~f:info_of_point_info

2
lib_stdlib_lwt/lwt_utils.ml
View File

@ -340,7 +340,7 @@ let protect ?on_error ?canceler t =
| Ok _ -> res | Ok _ -> res
| Error err -> | Error err ->
let canceled = let canceled =
Option.unopt_map canceler ~default:false ~f:Lwt_canceler.canceled in Option.unopt_map canceler ~default:false ~f:Lwt_canceler.canceled in
let err = if canceled then [Canceled] else err in let err = if canceled then [Canceled] else err in
match on_error with match on_error with
| None -> Lwt.return (Error err) | None -> Lwt.return (Error err)