From 7a6f748f60dc97382b321c9b9a915b066f6061b1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Apr 2026 22:04:02 +0200
Subject: [PATCH] Upgrade to colombe 0.13.0

---
 dune-project   |  2 +-
 letters.opam   |  2 +-
 lib/letters.ml | 11 ++---------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/dune-project b/dune-project
index c099a60..5348460 100644
--- a/dune-project
+++ b/dune-project
@@ -29,7 +29,7 @@
   (ca-certs
    (>= 0.2.1))
   (colombe
-   (>= 0.7.0))
+   (>= 0.13.0))
   (containers
    (>= 3.13.1))
   (fmt
diff --git a/letters.opam b/letters.opam
index 6186b24..c600e1a 100644
--- a/letters.opam
+++ b/letters.opam
@@ -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"}
diff --git a/lib/letters.ml b/lib/letters.ml
index d30781b..49839f0 100644
--- a/lib/letters.ml
+++ b/lib/letters.ml
@@ -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)
 ;;
 
@@ -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 ->