From 5e72391b27dabf00ba8d313a780d474e1fc245de Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 15 Mar 2016 00:29:01 -0700
Subject: [PATCH] Fix guarantee-uri and friends to correspond with their
 predicates.

---
 src/runtime/runtime.pkg | 7 +++----
 src/runtime/url.scm     | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 05104d2e3..4929d3240 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -5371,9 +5371,6 @@ USA.
   (files "url")
   (parent (runtime))
   (export ()
-	  (guarantee-absolute-uri ->absolute-uri)
-	  (guarantee-relative-uri ->relative-uri)
-	  (guarantee-uri ->uri)
 	  (url:decode-string decode-component)
 	  (url:match:escape matcher:pct-encoded)
 	  (url:parse:hostport parser:hostport)
@@ -5397,14 +5394,16 @@ USA.
 	  char-set:uri-userinfo
 	  encode-uri-path-segment
 	  error:not-partial-uri
-	  error:not-uri
 	  error:not-uri-authority
 	  error:not-uri-host
 	  error:not-uri-path
 	  error:not-uri-port
 	  error:not-uri-scheme
 	  error:not-uri-userinfo
+	  guarantee-absolute-uri
 	  guarantee-partial-uri
+	  guarantee-relative-uri
+	  guarantee-uri
 	  guarantee-uri-authority
 	  guarantee-uri-host
 	  guarantee-uri-path
diff --git a/src/runtime/url.scm b/src/runtime/url.scm
index 7b7c25e87..5803027f8 100644
--- a/src/runtime/url.scm
+++ b/src/runtime/url.scm
@@ -75,8 +75,9 @@ USA.
   (and (uri? object)
        (uri-relative? object)))
 
-(define (error:not-uri object caller)
-  (error:wrong-type-argument object "URI" caller))
+(define-guarantee uri "URI")
+(define-guarantee absolute-uri "absolute URI")
+(define-guarantee relative-uri "relative URI")
 
 (define (uri-scheme? object)
   (and (interned-symbol? object)
-- 
2.25.1