From 73a4bfc3d8e9bb5365e33a11a6ad3b8340d5195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 12 Jun 2022 21:09:35 +0200
Subject: Remove custom let*.

While it was nice, the most important part was the multi-valued let from
srfi-71 (which is implemented in srfi-71)). The minor pattern matching
structures could often be replaced with car+cdr, or a propper match.
---
 tests/test/web-server.scm | 58 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'tests/test/web-server.scm')

diff --git a/tests/test/web-server.scm b/tests/test/web-server.scm
index e5a796b6..69d18536 100644
--- a/tests/test/web-server.scm
+++ b/tests/test/web-server.scm
@@ -9,13 +9,13 @@
 
 (define-module (test web-server)
   :use-module (srfi srfi-64)
+  :use-module (srfi srfi-71)
   :use-module (srfi srfi-88)
   :use-module ((calp server routes) :select (make-make-routes))
   :use-module ((web server) :select (run-server))
   :use-module ((ice-9 threads)
                :select (call-with-new-thread cancel-thread))
   :use-module ((web client) :select (http-get))
-  :use-module ((hnh util) :select (let*))
   :use-module ((web response) :select (response-code response-location))
   :use-module ((web uri) :select (build-uri uri-path))
   :use-module ((guile)
@@ -71,39 +71,39 @@
       ;; This test should always fail, but should never be run
       (test-assert "Server returned unexpectedly" #f))))
 
-(let* ((response
-         _
-         (catch 'system-error
-                (lambda ()
-                  (http-get
-                    (build-uri 'http host: host port: port)))
-                (lambda (err proc fmt args data)
-                  (format
-                    (current-error-port)
-                    "~a (in ~a) ~?~%"
-                    err
-                    proc
-                    fmt
-                    args)
-                  (values (build-response code: 500) #f)))))
+(let ((response
+        _
+        (catch 'system-error
+               (lambda ()
+                 (http-get
+                   (build-uri 'http host: host port: port)))
+               (lambda (err proc fmt args data)
+                 (format
+                   (current-error-port)
+                   "~a (in ~a) ~?~%"
+                   err
+                   proc
+                   fmt
+                   args)
+                 (values (build-response code: 500) #f)))))
   (test-eqv
     "Basic connect"
     200
     (response-code response)))
 
-(let* ((response
-         body
-         (http-get
-           (build-uri
-             'http
-             host:
-             host
-             port:
-             port
-             path:
-             "/today"
-             query:
-             "view=week&date=2020-01-04"))))
+(let ((response
+        body
+        (http-get
+          (build-uri
+            'http
+            host:
+            host
+            port:
+            port
+            path:
+            "/today"
+            query:
+            "view=week&date=2020-01-04"))))
   (test-eqv
     "Redirect"
     302
-- 
cgit v1.2.3