[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67118] [PATCH] Change "tabulation" to "tabulation character" in lin
From: |
Simon Tournier |
Subject: |
[bug#67118] [PATCH] Change "tabulation" to "tabulation character" in linter & manual |
Date: |
Fri, 12 Jan 2024 10:03:24 +0100 |
Hi,
On Sat, 11 Nov 2023 at 15:54, Ian Eure <ian@retrospec.tv> wrote:
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 94903fb5e2..6396f129a1 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -119,6 +119,7 @@
> Copyright @copyright{} 2023 Zheng Junjie@*
> Copyright @copyright{} 2023 Brian Cully@*
> Copyright @copyright{} 2023 Felix Lechner@*
> +Copyright @copyright{} 2023 Ian Eure@*
I am not sure that a oneline change implies a Copyright header. :-)
And other change neither, I guess.
> - make-flags #:allow-other-keys)
> + make-flags #:allow-other-keys)
> (define make-flags/sexp
> (if (gexp? make-flags/sexp)
> (gexp->approximate-sexp make-flags)
> make-flags))
> - ;; Some packages like 'tzdata' are never cross-compiled;
> - ;; the compilers are only used to build tools for
> - ;; compiling the rest of the package.
> - (if (eq? target '#false)
> - '()
> - (find-incorrect-compilers make-flags/sexp)))
> + ;; Some packages like 'tzdata' are never cross-compiled;
> + ;; the compilers are only used to build tools for
> + ;; compiling the rest of the package.
> + (if (eq? target '#false)
> + '()
> + (find-incorrect-compilers make-flags/sexp)))
> (package-arguments package))))
There is no change here, right?
> diff --git a/tests/lint.scm b/tests/lint.scm
> index a52a82237b..cec9e3ab21 100644
> --- a/tests/lint.scm
> +++ b/tests/lint.scm
> @@ -11,6 +11,7 @@
> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
> ;;; Copyright © 2021, 2023 Maxime Devos <maximedevos@telenet.be>
> +;;; Copyright © 2023 Ian Eure <ian@retrospec.tv>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -359,18 +360,18 @@ (define (warning-contains? str warnings)
> '()
> (check-compiler-for-target
> (dummy-package "x"
> - (arguments
> - (list #:make-flags
> - #~(list (string-append "CC=" (cc-for-target))))))))
> + (arguments
> + (list #:make-flags
> + #~(list (string-append "CC=" (cc-for-target))))))))
No change here, right?
> (test-equal "compiler-for-target: CC=gcc is acceptable when target=#false"
> '()
> (check-compiler-for-target
> ;; This (dummy) package consists purely of architecture-independent data.
> (dummy-package "tzdata"
> - (arguments
> - (list #:target #false
> - #:make-flags #~(list "CC=gcc"))))))
> + (arguments
> + (list #:target #false
> + #:make-flags #~(list "CC=gcc"))))))
No change?
> ;; The emacs-build-system sets #:tests? #f by default.
> (test-equal "tests-true: #:tests? #t acceptable for emacs packages"
> @@ -1307,16 +1308,16 @@ (define (package-with-phase-changes changes)
>
> (test-assert "formatting: tabulation"
> (string-match-or-error
> - "tabulation on line [0-9]+, column [0-9]+"
> + "tabulation character \\(0x09\\) on line [0-9]+, column [0-9]+"
> (single-lint-warning-message
> - (check-formatting (dummy-package "leave the tab here: ")))))
> + (check-formatting (dummy-package "leave the tab here: ")))))
>
> (test-assert "formatting: trailing white space"
> (string-match-or-error
> "trailing white space .*"
> ;; Leave the trailing white space on the next line!
> (single-lint-warning-message
> - (check-formatting (dummy-package "x")))))
> + (check-formatting (dummy-package "x")))))
What is the change here?
Cheers,
simon
- [bug#67118] [PATCH] Change "tabulation" to "tabulation character" in linter & manual,
Simon Tournier <=