From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ff3dd-0006jW-FX for guix-patches@gnu.org; Mon, 16 Jul 2018 09:34:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ff3da-0002IH-DJ for guix-patches@gnu.org; Mon, 16 Jul 2018 09:34:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37363) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ff3da-0002I5-9X for guix-patches@gnu.org; Mon, 16 Jul 2018 09:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ff3da-0005aH-1l for guix-patches@gnu.org; Mon, 16 Jul 2018 09:34:02 -0400 Subject: [bug#32174] [PATCH 3/6] gexp: Remove unnecessary 'mlet'. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 16 Jul 2018 15:33:24 +0200 Message-Id: <20180716133327.15901-3-ludo@gnu.org> In-Reply-To: <20180716133327.15901-1-ludo@gnu.org> References: <20180716133327.15901-1-ludo@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32174@debbugs.gnu.org * guix/gexp.scm (imported-modules): Use 'let' instead of 'mlet'. --- guix/gexp.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index cc3613f6f..3414b81dc 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1098,18 +1098,14 @@ by an arrow followed by a file-like object. For example: In this example, the first two modules are taken from MODULE-PATH, and the last one is created from the given object." - (mlet %store-monad ((files - (mapm %store-monad - (match-lambda - (((module ...) '=> file) - (return - (cons (module->source-file-name module) - file))) - ((module ...) - (let ((f (module->source-file-name module))) - (return - (cons f (search-path* module-path f)))))) - modules))) + (let ((files (map (match-lambda + (((module ...) '=> file) + (cons (module->source-file-name module) + file)) + ((module ...) + (let ((f (module->source-file-name module))) + (cons f (search-path* module-path f))))) + modules))) (imported-files files #:name name #:system system #:guile guile #:deprecation-warnings deprecation-warnings))) -- 2.18.0