From ba48718b5bc6d0eb4eef1f8ead91940e1c011206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 13 Feb 2022 22:12:33 +0100
Subject: Datetime restrict imports.

We might want to break datetime out into its own (independent) module,
but for that we should have a clear understanding of what it uses.
---
 module/datetime.scm          | 11 ++++++-----
 module/datetime/timespec.scm |  8 ++++----
 module/datetime/zic.scm      | 15 ++++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/module/datetime.scm b/module/datetime.scm
index 95f2f77d..3b03bf53 100644
--- a/module/datetime.scm
+++ b/module/datetime.scm
@@ -9,17 +9,18 @@
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-9 gnu)
 
-  :use-module (hnh util)
+  :use-module ((hnh util)
+               :select (vector-last define*-public set! -> swap case* set
+                                    span-upto let* set->))
 
   :use-module (srfi srfi-41)
-  :use-module (srfi srfi-41 util)
+  :use-module ((srfi srfi-41 util)
+               :select (with-streams))
   :use-module (ice-9 i18n)
   :use-module (ice-9 format)
-  :use-module (ice-9 match)
   :use-module (ice-9 regex)
   :use-module (calp util config)
-  :re-export (locale-month locale-month-short)
-  )
+  :re-export (locale-month locale-month-short))
 
 
 ;;; Enums
diff --git a/module/datetime/timespec.scm b/module/datetime/timespec.scm
index 9b236e2d..712ff327 100644
--- a/module/datetime/timespec.scm
+++ b/module/datetime/timespec.scm
@@ -4,8 +4,10 @@
 ;;; Code:
 
 (define-module (datetime timespec)
-  :use-module (hnh util)
-  :use-module (hnh util exceptions)
+  :export (make-timespec
+           timespec? timespec-time timespec-sign timespec-type)
+  :use-module ((hnh util) :select (set define*-public unless let*))
+  :use-module ((hnh util exceptions) :select (warning))
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu)
@@ -26,8 +28,6 @@
   ;; u, g, z - Universal time
   (type timespec-type))                 ; char
 
-(export make-timespec timespec? timespec-time timespec-sign timespec-type)
-
 (define-public (timespec-zero)
   (make-timespec (time) '+ #\w))
 
diff --git a/module/datetime/zic.scm b/module/datetime/zic.scm
index 6343dce3..b07c2bfa 100644
--- a/module/datetime/zic.scm
+++ b/module/datetime/zic.scm
@@ -11,14 +11,18 @@
 ;; See zic(8) for data format
 ;;; Code:
 (define-module (datetime zic)
-  :use-module (hnh util)
-  :use-module (hnh util exceptions)
+  :use-module ((hnh util)
+               :select (awhen group set when sort* iterate group-by let*))
+  :use-module ((hnh util exceptions) :select (warning))
   :use-module (datetime)
   :use-module (datetime timespec)
-  :use-module (ice-9 rdelim)
+  :use-module ((ice-9 rdelim) :select (read-line))
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
-  :use-module (srfi srfi-9 gnu))
+  :use-module (srfi srfi-9 gnu)
+  :use-module ((vcomponent recurrence internal)
+               :select (byday make-recur-rule bymonthday))
+  )
 
 
 (define-public (read-zoneinfo ports-or-filenames)
@@ -342,9 +346,6 @@ expries rules aren't yet implemented." type)]
      (datetime time: (timespec-time timespec)))
     ))
 
-
-(use-modules (vcomponent recurrence internal))
-
 (define-public (rule->rrule rule)
   (if (eq? 'only (rule-to rule))
       #f
-- 
cgit v1.2.3