From a5e2fc73760a2ae023f2e56bdbf8025971f90e64 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Jul 2020 22:58:08 +0200 Subject: utils: Move and '&error-location' to (guix diagnostics). * guix/utils.scm (, source-properties->location) (location->source-properties, &error-location): Move to... * guix/diagnostics.scm: ... here. * gnu.scm: Adjust imports accordingly. * gnu/machine.scm: Likewise. * gnu/system.scm: Likewise. * gnu/tests.scm: Likewise. * guix/inferior.scm: Likewise. * tests/channels.scm: Likewise. * tests/packages.scm: Likewise. --- tests/channels.scm | 2 +- tests/packages.scm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/channels.scm b/tests/channels.scm index cde3b668fb..55a0537e0f 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -26,7 +26,7 @@ (define-module (test-channels) #:use-module (guix derivations) #:use-module (guix sets) #:use-module (guix gexp) - #:use-module ((guix utils) + #:use-module ((guix diagnostics) #:select (error-location? error-location location-line)) #:use-module ((guix build utils) #:select (which)) #:use-module (git) diff --git a/tests/packages.scm b/tests/packages.scm index 6aa36170d2..0a4bf83c40 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -23,7 +23,8 @@ (define-module (test-packages) #:use-module (guix monads) #:use-module (guix grafts) #:use-module ((guix gexp) #:select (local-file local-file-file)) - #:use-module ((guix utils) + #:use-module (guix utils) + #:use-module ((guix diagnostics) ;; Rename the 'location' binding to allow proper syntax ;; matching when setting the 'location' field of a package. #:renamer (lambda (name) -- cgit v1.2.3