diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-12-02 17:33:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-12-12 23:23:34 +0100 |
| commit | 3addff87c1f3c686ae528d47cbf6bad1e98032c0 (patch) | |
| tree | ff8718514a8d9766a5a1de65c9a9a7936e0a0998 | |
| parent | 97e7e47d6f1e036e1ed6bd3f428e40d9794a3353 (diff) | |
| download | guix-3addff87c1f3c686ae528d47cbf6bad1e98032c0.tar.gz guix-3addff87c1f3c686ae528d47cbf6bad1e98032c0.zip | |
build-system/cargo: Simplify ‘crate-closure’.
* guix/build-system/cargo.scm (crate-closure): Remove ‘first?’.
Change-Id: Ica1a661eb422a882ae3a1a54819b2dd7d68449de
| -rw-r--r-- | guix/build-system/cargo.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 658a2e525e..0e9a4b1d23 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2016, 2019, 2021, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2016 David Craven <david@craven.ch> @@ -227,24 +227,22 @@ do not extract the conventional inputs)." (let loop ((inputs inputs) (result '()) (propagated '()) - (first? #t) (seen vlist-null)) (match inputs (() (if (null? propagated) (reverse result) - (loop (reverse (concatenate propagated)) result '() #f seen))) + (loop (reverse (concatenate propagated)) result '() seen))) (((and input (label (? package? package))) rest ...) - (if (and (not first?) (seen? seen package)) - (loop rest result propagated first? seen) + (if (seen? seen package) + (loop rest result propagated seen) (loop rest (cons input result) (cons (package-cargo-inputs package) propagated) - first? (vhash-consq package package seen)))) ((input rest ...) - (loop rest (cons input result) propagated first? seen))))) + (loop rest (cons input result) propagated seen))))) (define (expand-crate-sources cargo-inputs cargo-development-inputs) "Extract all transitive sources for CARGO-INPUTS and CARGO-DEVELOPMENT-INPUTS |