Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the compilation with mimic-happy-eyeballs.0.0.8 #642

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Fix the compilation with mimic-happy-eyeballs.0.0.8 #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eee5cf
Fix the compilation with mimic-happy-eyeballs.0.0.8
dinosaure Jun 11, 2024
403a699
git-unix requires, at least, mimic.0.0.8
dinosaure Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion git-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
"mirage-flow" {>= "4.0.0"}
"ke" {>= "0.4" & with-test}
"mirage-crypto-rng" {>= "0.11.0" & with-test}
"mimic"
"mimic" {>= "0.0.8"}
"tls" {>= "0.14.0"}
]
conflicts: [ "result" {< "1.5"} ]
Expand Down
5 changes: 3 additions & 2 deletions src/git-unix/git_unix_mimic.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ module Happy_eyeballs = struct

let happy_eyeballs = Mimic.make ~name:"happy-eyeballs-lwt"

let resolve t addr ports =
Happy_eyeballs_lwt.connect t addr ports >|= Rresult.R.open_error_msg
let resolve t ?aaaa_timeout ?connect_delay ?connect_timeout ?resolve_timeout ?resolve_retries addr ports =
Happy_eyeballs_lwt.connect ?aaaa_timeout ?connect_delay ?connect_timeout ?resolve_timeout ?resolve_retries
t addr ports >|= Rresult.R.open_error_msg
end

module TCP = struct
Expand Down