[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: utils: Move '&fix-hint' to (guix diagnostics).
From: |
guix-commits |
Subject: |
03/09: utils: Move '&fix-hint' to (guix diagnostics). |
Date: |
Sat, 25 Jul 2020 13:13:53 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f9a8dd053c4e0fd1fc4b64291bb90de36520b3bc
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 24 23:28:11 2020 +0200
utils: Move '&fix-hint' to (guix diagnostics).
* guix/utils.scm (&fix-hint): Move to...
* guix/diagnostics.scm (&fix-hint): ... here.
* gnu.scm: Adjust imports accordingly.
* gnu/system/mapped-devices.scm: Likewise.
* guix/channels.scm: Likewise.
* guix/profiles.scm: Likewise.
* guix/scripts/system/reconfigure.scm: Likewise.
* guix/ssh.scm: Likewise.
---
gnu.scm | 1 -
gnu/system/mapped-devices.scm | 2 +-
guix/channels.scm | 4 ----
guix/diagnostics.scm | 8 ++++++++
guix/profiles.scm | 1 +
guix/scripts/system/reconfigure.scm | 1 -
guix/ssh.scm | 2 +-
guix/utils.scm | 15 +++++----------
8 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/gnu.scm b/gnu.scm
index 5f593bd..b95082f 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -20,7 +20,6 @@
(define-module (gnu)
#:use-module (guix i18n)
- #:use-module ((guix utils) #:select (&fix-hint))
#:use-module (guix diagnostics)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index c3f9830..00f235e 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -23,7 +23,7 @@
#:use-module (guix records)
#:use-module ((guix modules) #:hide (file-name->module-name))
#:use-module (guix i18n)
- #:use-module ((guix utils)
+ #:use-module ((guix diagnostics)
#:select (source-properties->location
&fix-hint
&error-location))
diff --git a/guix/channels.scm b/guix/channels.scm
index bbabf65..21a2fdb 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -40,10 +40,6 @@
#:use-module (guix sets)
#:use-module (guix store)
#:use-module (guix i18n)
- #:use-module ((guix utils)
- #:select (source-properties->location
- &error-location
- &fix-hint))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-2)
#:use-module (srfi srfi-9)
diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm
index 8b24b1b..3096d38 100644
--- a/guix/diagnostics.scm
+++ b/guix/diagnostics.scm
@@ -43,6 +43,10 @@
error-location?
error-location
+ &fix-hint
+ fix-hint?
+ condition-fix-hint
+
guix-warning-port
program-name))
@@ -225,6 +229,10 @@ a location object."
error-location?
(location error-location)) ;<location>
+(define-condition-type &fix-hint &condition
+ fix-hint?
+ (hint condition-fix-hint)) ;string
+
(define guix-warning-port
(make-parameter (current-warning-port)))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index f34f73e..0619e73 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -32,6 +32,7 @@
#:use-module ((guix utils) #:hide (package-name->name+version))
#:use-module ((guix build utils)
#:select (package-name->name+version mkdir-p))
+ #:use-module ((guix diagnostics) #:select (&fix-hint))
#:use-module (guix i18n)
#:use-module (guix records)
#:use-module (guix packages)
diff --git a/guix/scripts/system/reconfigure.scm
b/guix/scripts/system/reconfigure.scm
index 9013e03..a257083 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -39,7 +39,6 @@
#:autoload (guix git) (update-cached-checkout)
#:use-module (guix i18n)
#:use-module (guix diagnostics)
- #:use-module ((guix utils) #:select (&fix-hint))
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
diff --git a/guix/ssh.scm b/guix/ssh.scm
index b9e6ff8..4184439 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -20,7 +20,7 @@
#:use-module (guix store)
#:use-module (guix inferior)
#:use-module (guix i18n)
- #:use-module ((guix utils) #:select (&fix-hint))
+ #:use-module ((guix diagnostics) #:select (&fix-hint))
#:use-module (gcrypt pk-crypto)
#:use-module (ssh session)
#:use-module (ssh auth)
diff --git a/guix/utils.scm b/guix/utils.scm
index 8198204..436c5cd 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -29,7 +29,6 @@
#:use-module (srfi srfi-9)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
- #:use-module (srfi srfi-35)
#:use-module (srfi srfi-39)
#:use-module (ice-9 ftw)
#:use-module (rnrs io ports) ;need 'port-position' etc.
@@ -55,7 +54,11 @@
&error-location
error-location?
- error-location)
+ error-location
+
+ &fix-hint
+ fix-hint?
+ condition-fix-hint)
#:export (strip-keyword-arguments
default-keyword-arguments
substitute-keyword-arguments
@@ -63,10 +66,6 @@
current-source-directory
- &fix-hint
- fix-hint?
- condition-fix-hint
-
nix-system->gnu-triplet
gnu-triplet->nix-system
%current-system
@@ -833,10 +832,6 @@ be determined."
;; raising an error would upset Geiser users
#f))))))
-(define-condition-type &fix-hint &condition
- fix-hint?
- (hint condition-fix-hint)) ;string
-
;;; Local Variables:
;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1)
;;; End:
- branch master updated (07dbdbd -> 9a63227), guix-commits, 2020/07/25
- 02/09: utils: Remove compatibility re-export of 'memoize'., guix-commits, 2020/07/25
- 03/09: utils: Move '&fix-hint' to (guix diagnostics).,
guix-commits <=
- 01/09: utils: Move <location> and '&error-location' to (guix diagnostics)., guix-commits, 2020/07/25
- 05/09: ui: Factorize '&message' handling., guix-commits, 2020/07/25
- 06/09: diagnostics: Add a procedural variant of diagnostic procedures., guix-commits, 2020/07/25
- 04/09: file-systems: Convey hint via '&fix-hint'., guix-commits, 2020/07/25
- 07/09: diagnostics: Add '&formatted-message'., guix-commits, 2020/07/25
- 08/09: Use 'formatted-message' instead of '&message' where appropriate., guix-commits, 2020/07/25
- 09/09: guix system: Report file system errors using 'report-error'., guix-commits, 2020/07/25