From 4f75d945436d8c6ddc2deb5936a22bffe94b7ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 4 Jul 2020 06:34:52 +0200
Subject: Merge (datetime util) into (datetime).

---
 tests/datetime-util.scm   | 4 ++--
 tests/recurrence-rule.scm | 2 +-
 tests/recurrence.scm      | 3 ++-
 tests/recurring.scm       | 2 +-
 tests/rrule-parse.scm     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/datetime-util.scm b/tests/datetime-util.scm
index 80a8df5e..123229c7 100644
--- a/tests/datetime-util.scm
+++ b/tests/datetime-util.scm
@@ -1,5 +1,5 @@
-(((datetime) date time datetime)
- ((datetime util) month-stream in-date-range? timespan-overlaps?)
+(((datetime) date time datetime
+  month-stream in-date-range? timespan-overlaps?)
  ((srfi srfi-41) stream->list stream-take
   ))
 
diff --git a/tests/recurrence-rule.scm b/tests/recurrence-rule.scm
index 303b4547..58daaa9b 100644
--- a/tests/recurrence-rule.scm
+++ b/tests/recurrence-rule.scm
@@ -1,7 +1,7 @@
 (((vcomponent recurrence parse) parse-recurrence-rule)
  ((vcomponent recurrence internal)
   make-recur-rule weekdays intervals)
- ((datetime util) mon))
+ ((datetime) mon))
 
 
 (test-equal
diff --git a/tests/recurrence.scm b/tests/recurrence.scm
index fad8e7dc..a3720ce8 100644
--- a/tests/recurrence.scm
+++ b/tests/recurrence.scm
@@ -10,7 +10,8 @@
  ((vcomponent recurrence display) format-recurrence-rule)
  ((vcomponent recurrence internal) count until)
  ((vcomponent base) make-vcomponent prop prop* extract)
- ((datetime) parse-ics-datetime datetime time date)
+ ((datetime) parse-ics-datetime datetime time date
+  datetime->string)
  ((util) -> mod!)
  ((guile) set!)
  ((srfi srfi-41) stream->list)
diff --git a/tests/recurring.scm b/tests/recurring.scm
index 3922f1b6..a6b60dc7 100644
--- a/tests/recurring.scm
+++ b/tests/recurring.scm
@@ -1,5 +1,5 @@
 (((srfi srfi-41) stream-take stream-map stream->list stream-car)
- ((datetime util) day-stream)
+ ((datetime) day-stream)
  ((vcomponent base) extract prop)
 
  ((vcomponent) parse-calendar)
diff --git a/tests/rrule-parse.scm b/tests/rrule-parse.scm
index 12ba93fd..c10266aa 100644
--- a/tests/rrule-parse.scm
+++ b/tests/rrule-parse.scm
@@ -1,7 +1,7 @@
 (((vcomponent recurrence parse)
   parse-recurrence-rule)
  ((vcomponent recurrence) make-recur-rule)
- ((datetime util) mon)
+ ((datetime) mon)
  ((util exceptions) warnings-are-errors warning-handler)
  )
 
-- 
cgit v1.2.3