From e52cad0285d46dd9747a5cdb2053635132a97255 Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 21 May 2025 12:16:20 +0200 Subject: [PATCH] tests/functional/lang: Don't use tabs for indentation Don't ask me the fuck why, but *somehow* Nix prints error locations differently if the input file is passed as a path vs through stdin, and I have a hunch that this might have to do with tabs Change-Id: I186b0edb90edd48856da3621815463e372c37512 --- ...arse-okay-rec-set-override-warning.err.exp | 20 +++++++++---------- .../parse-okay-rec-set-override-warning.nix | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp b/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp index 9fc07b6b5..6b55c567f 100644 --- a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp +++ b/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp @@ -1,12 +1,12 @@ warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning. - at «stdin»:3:16: - 2| # Should warn - 3| { a = rec {}; a.__overrides = {}; } - | ^ - 4| rec { __overrides = {}; } + at «stdin»:3:17: + 2| # Should warn + 3| { a = rec {}; a.__overrides = {}; } + | ^ + 4| rec { __overrides = {}; } warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning. - at «stdin»:4:8: - 3| { a = rec {}; a.__overrides = {}; } - 4| rec { __overrides = {}; } - | ^ - 5| # Should not warn: Not recursive + at «stdin»:4:9: + 3| { a = rec {}; a.__overrides = {}; } + 4| rec { __overrides = {}; } + | ^ + 5| # Should not warn: Not recursive diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.nix b/tests/functional/lang/parse-okay-rec-set-override-warning.nix index a81d46d53..2a2648b81 100644 --- a/tests/functional/lang/parse-okay-rec-set-override-warning.nix +++ b/tests/functional/lang/parse-okay-rec-set-override-warning.nix @@ -1,9 +1,9 @@ [ - # Should warn - { a = rec {}; a.__overrides = {}; } - rec { __overrides = {}; } - # Should not warn: Not recursive - { __overrides = {}; } - # Should not warn: Dynamic - rec { ${"__overrides" + ""} = {}; } + # Should warn + { a = rec {}; a.__overrides = {}; } + rec { __overrides = {}; } + # Should not warn: Not recursive + { __overrides = {}; } + # Should not warn: Dynamic + rec { ${"__overrides" + ""} = {}; } ]