From 7c768c09841d7346444d65721b132d144835fc99 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Sep 2011 18:57:38 -0400 Subject: [PATCH] simplify --- Git.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Git.hs b/Git.hs index ab43504e1a..cd6cdfbfd0 100644 --- a/Git.hs +++ b/Git.hs @@ -335,10 +335,8 @@ urlHostUser r = urlAuthPart uriUserInfo r ++ urlAuthPart uriRegName' r {- The full authority portion an URL repo. (ie, "user@host:port") -} urlAuthority :: Repo -> String -urlAuthority Repo { location = Url u } = uriUserInfo a ++ uriRegName' a ++ uriPort a - where - a = fromMaybe (error $ "bad url " ++ show u) (uriAuthority u) -urlAuthority repo = assertUrl repo $ error "internal" +urlAuthority r = flip urlAuthPart r $ \a -> + uriUserInfo a ++ uriRegName' a ++ uriPort a {- Applies a function to extract part of the uriAuthority of an URL repo. -} urlAuthPart :: (URIAuth -> a) -> Repo -> a