From 1ff931eb80305a03b904d4f4a2a295d4033b7396 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Sat, 23 May 2015 11:39:55 -0400
Subject: [PATCH] Break dependency on web-server-lib

---
 info.rkt                  | 1 -
 minimart/drivers/tcp.rkt  | 2 +-
 minimart/exn-util.rkt     | 8 ++++++++
 minimart/trace.rkt        | 2 +-
 minimart/trace/stderr.rkt | 4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 minimart/exn-util.rkt

diff --git a/info.rkt b/info.rkt
index a50c477..bc4fa65 100644
--- a/info.rkt
+++ b/info.rkt
@@ -7,5 +7,4 @@
 	       "net-lib"
 	       "profile-lib"
 	       "rackunit-lib"
-	       "web-server-lib"
 	       ))
diff --git a/minimart/drivers/tcp.rkt b/minimart/drivers/tcp.rkt
index 912b5f2..5bbb838 100644
--- a/minimart/drivers/tcp.rkt
+++ b/minimart/drivers/tcp.rkt
@@ -3,9 +3,9 @@
 (require racket/match)
 (require (prefix-in tcp: racket/tcp))
 (require (only-in racket/port read-bytes-avail!-evt))
-(require (only-in web-server/private/util exn->string))
 (require "../main.rkt")
 (require "../demand-matcher.rkt")
+(require "../exn-util.rkt")
 
 (require racket/unit)
 (require net/tcp-sig)
diff --git a/minimart/exn-util.rkt b/minimart/exn-util.rkt
new file mode 100644
index 0000000..17e23ed
--- /dev/null
+++ b/minimart/exn-util.rkt
@@ -0,0 +1,8 @@
+#lang racket/base
+
+(provide exn->string)
+
+(define (exn->string exn)
+  (parameterize ([current-error-port (open-output-string)])
+    ((error-display-handler) (exn-message exn) exn)
+    (get-output-string (current-error-port))))
diff --git a/minimart/trace.rkt b/minimart/trace.rkt
index ffd0cbb..230bb95 100644
--- a/minimart/trace.rkt
+++ b/minimart/trace.rkt
@@ -8,7 +8,7 @@
 	 trace-process-step
 	 trace-internal-step)
 
-(require (only-in web-server/private/util exn->string))
+(require "exn-util.rkt")
 
 (define trace-logger (make-logger 'minimart-trace))
 
diff --git a/minimart/trace/stderr.rkt b/minimart/trace/stderr.rkt
index ee0fc76..b1a57da 100644
--- a/minimart/trace/stderr.rkt
+++ b/minimart/trace/stderr.rkt
@@ -6,10 +6,10 @@
 (require racket/match)
 (require racket/pretty)
 (require (only-in racket/string string-join))
-(require (only-in web-server/private/util exn->string))
 (require "../core.rkt")
 (require "../gestalt.rkt")
 (require "../trace.rkt")
+(require "../exn-util.rkt")
 
 (define (env-aref varname default alist)
   (define key (or (getenv varname) default))
@@ -131,7 +131,7 @@
 	   (with-color WHITE-ON-RED
 		       (output "Process ~a died with exception:\n~a\n"
 			       pidstr
-			       (exn->string exn))))
+                               (exn->string exn))))
 	 (when (or relevant-exn? show-process-states-post?)
 	   (when t
 	     (unless (boring-state? (transition-state t))