GNU bug report logs - #74767
[PATCH rust-team 00/23] Add py-spy.

Previous Next

Full log

View this message in rfc822 format

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 74767 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Efraim Flashner <efraim <at> flashner.co.il>
Subject: [bug#74767] [PATCH rust-team 01/23] build/cargo: Delete trailing #t in phases.
Date: Tue, 10 Dec 2024 23:21:04 +0900

* guix/build/cargo-build-system.scm (unpack-rust-crates): Delete trailing #t.
(configure, patch-cargo-checksums, package, install): Likewise.

Change-Id: I510a46b3d35cd292d71d5646d4a0436f7d77f98e
---
 guix/build/cargo-build-system.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 132a811f49..84897393d9 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -105,8 +105,7 @@ (define* (unpack-rust-crates #:key inputs vendor-dir #:allow-other-keys)
 
       (for-each (lambda (crate)
                   (invoke "tar" "xzf" crate "-C" vendor-dir))
-                (find-files "target/package" "\\.crate$"))))
-  #t)
+                (find-files "target/package" "\\.crate$")))))
 
 (define (rust-package? name)
   (string-prefix? "rust-" name))
@@ -220,8 +219,7 @@ (define* (configure #:key inputs
   ;; during building, and in any case if one is not present it is created
   ;; during the 'build phase by cargo.
   (when (file-exists? "Cargo.lock")
-    (delete-file "Cargo.lock"))
-  #t)
+    (delete-file "Cargo.lock")))
 
 ;; After the 'patch-generated-file-shebangs phase any vendored crates who have
 ;; their shebangs patched will have a mismatch on their checksum.
@@ -229,10 +227,10 @@ (define* (patch-cargo-checksums #:key
                                 (vendor-dir "guix-vendor")
                                 #:allow-other-keys)
   "Patch the checksums of the vendored crates after patching their shebangs."
-  (generate-all-checksums vendor-dir)
-  #t)
+  (generate-all-checksums vendor-dir))
 
 (define* (build #:key
+                parallel-build?
                 skip-build?
                 (features '())
                 (cargo-build-flags '("--release"))
@@ -311,8 +309,7 @@ (define* (package #:key
                        (find-files dir #:directories? #t))
                 (delete-file-recursively dir)))
             (find-files "." "\\.crate$")))))
-    (format #t "Not installing cargo sources, skipping `cargo package`.~%"))
-  #t)
+    (format #t "Not installing cargo sources, skipping `cargo package`.~%")))
 
 (define* (install #:key
                   inputs
@@ -348,9 +345,7 @@ (define* (install #:key
 
       (for-each (lambda (crate)
                   (invoke "tar" "xzf" crate "-C" sources))
-                (find-files registry "\\.crate$")))
-
-    #t))
+                (find-files registry "\\.crate$")))))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
-- 
2.46.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.