Skip to content

Upgrade to colombe 0.13.0 #60

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

Open
vbgl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to colombe 0.13.0 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
(ca-certs
(>= 0.2.1))
(colombe
(>= 0.7.0))
(>= 0.13.0))
(containers
(>= 3.13.1))
(fmt
Expand Down
2 changes: 1 addition & 1 deletion letters.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bug-reports: "https://github.com/oxidizing/letters/issues"
depends: [
"dune" {>= "2.7"}
"ca-certs" {>= "0.2.1"}
"colombe" {>= "0.7.0"}
"colombe" {>= "0.13.0"}
"containers" {>= "3.13.1"}
"fmt" {>= "0.8.8"}
"fpath" {>= "0.7.0"}
Expand Down
11 changes: 2 additions & 9 deletions lib/letters.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ let stream_of_string s =

let str_to_colombe_address str_address =
match Emile.of_string str_address with
| Ok mailbox ->
(match Colombe_emile.to_forward_path mailbox with
| Ok address -> address
| Error _ -> raise (Invalid_email_address str_address))
| Ok mailbox -> Colombe_emile.to_forward_path mailbox
| Error _ -> raise (Invalid_email_address str_address)
;;

Expand Down Expand Up @@ -235,11 +232,7 @@ let send =
| Ok v -> v
| Error (`Invalid (_, _)) -> failwith "Invalid sender address"
in
let from_addr =
match Colombe_emile.to_reverse_path from_mailbox with
| Ok v -> v
| Error (`Msg msg) -> failwith msg
in
let from_addr = Colombe_emile.to_reverse_path from_mailbox in
let recipients =
List.map
(fun recipient ->
Expand Down