From e6e6c700061624519b84ceac28914ad11ed36e5c Mon Sep 17 00:00:00 2001
From: "B. Blechschmidt" <git@blechschmidt.io>
Date: Sat, 25 Mar 2023 10:58:16 +0100
Subject: [PATCH] Fix formatting

IPv6 addresses without ports are not enclosed in brackets. They only get
enclosed in brackets in combination with a port.
---
 src/tun2proxy.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs
index 9f8f287..5c8100b 100644
--- a/src/tun2proxy.rs
+++ b/src/tun2proxy.rs
@@ -30,10 +30,7 @@ pub enum DestinationHost {
 impl std::fmt::Display for DestinationHost {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            DestinationHost::Address(addr) => match addr {
-                IpAddr::V4(_) => addr.fmt(f),
-                IpAddr::V6(_) => write!(f, "[{}]", addr),
-            },
+            DestinationHost::Address(addr) => addr.fmt(f),
             Hostname(name) => name.fmt(f),
         }
     }
@@ -69,7 +66,11 @@ impl From<SocketAddr> for Destination {
 
 impl std::fmt::Display for Destination {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}:{}", self.host, self.port)
+        if let DestinationHost::Address(IpAddr::V6(addr)) = self.host {
+            write!(f, "[{}]:{}", addr, self.port)
+        } else {
+            write!(f, "{}:{}", self.host, self.port)
+        }
     }
 }