diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-11-03 11:10:03 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-11-11 10:51:45 -0600 |
| commit | f49f20069185c5ae9a129a8a7c0ad921fa8e9625 (patch) | |
| tree | 19660a3ee3355c69eb10fed5f70bf20eaa59cc79 /src/config_diff.mli | |
| parent | 1e1f68b21d7c343569a78000773ba029568bacfd (diff) | |
| download | vyos1x-config-f49f20069185c5ae9a129a8a7c0ad921fa8e9625.tar.gz vyos1x-config-f49f20069185c5ae9a129a8a7c0ad921fa8e9625.zip | |
T7988: change type name to avoid collision with standard result type
Diffstat (limited to 'src/config_diff.mli')
| -rw-r--r-- | src/config_diff.mli | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/config_diff.mli b/src/config_diff.mli index 453f13f..3c361b1 100644 --- a/src/config_diff.mli +++ b/src/config_diff.mli @@ -19,14 +19,14 @@ module Diff_string : sig } end -type _ result = - | Diff_tree : Diff_tree.t -> Diff_tree.t result - | Diff_string : Diff_string.t -> Diff_string.t result +type _ diff_result = + | Diff_tree : Diff_tree.t -> Diff_tree.t diff_result + | Diff_string : Diff_string.t -> Diff_string.t diff_result -val eval_result : 'a result -> 'a +val eval_diff_result : 'a diff_result -> 'a -type 'a diff_func = ?recurse:bool -> string list -> 'a result -> change -> 'a result -val diff : string list -> 'a diff_func -> 'a result -> Config_tree.t option * Config_tree.t option -> 'a result +type 'a diff_func = ?recurse:bool -> string list -> 'a diff_result -> change -> 'a diff_result +val diff : string list -> 'a diff_func -> 'a diff_result -> Config_tree.t option * Config_tree.t option -> 'a diff_result exception Incommensurable exception Empty_comparison |