Skip to content

Commit c0e6692

Browse files
roberthroberth
committed
fix: Update shifted source positions after formatting
Carefully reviewed...
1 parent 96e550e commit c0e6692

File tree

43 files changed

+392
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+392
-377
lines changed

‎tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
error:
22
… while calling the 'addDrvOutputDependencies' builtin
3-
at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:18:4:
4-
17|
5-
18| in builtins.addDrvOutputDependencies combo-path
6-
| ^
7-
19|
3+
at /pwd/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix:25:1:
4+
24| in
5+
25| builtins.addDrvOutputDependencies combo-path
6+
| ^
7+
26|
88

99
error: context of string '/nix/store/pg9yqs4yd85yhdm3f4i5dyaqp5jahrsz-fail.drv/nix/store/2dxd5frb715z451vbf7s8birlf3argbk-fail-2.drv' must have exactly one element, but has 2

‎tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
error:
22
… while calling the 'addDrvOutputDependencies' builtin
3-
at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:9:4:
4-
8|
5-
9| in builtins.addDrvOutputDependencies drv.outPath
6-
| ^
7-
10|
3+
at /pwd/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix:13:1:
4+
12| in
5+
13| builtins.addDrvOutputDependencies drv.outPath
6+
| ^
7+
14|
88

99
error: `addDrvOutputDependencies` can only act on derivations, not on a derivation output such as 'out'

‎tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error:
22
… while evaluating the condition of the assertion '({ a = true; } == { a = true; b = true; })'
33
at /pwd/lang/eval-fail-assert-equal-attrs-names-2.nix:1:1:
4-
1| assert { a = true; } == { a = true; b = true; };
4+
1| assert
55
| ^
6-
2| throw "unreachable"
6+
2| {
77

88
error: attribute names of attribute set '{ a = true; }' differs from attribute set '{ a = true; b = true; }'

‎tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error:
22
… while evaluating the condition of the assertion '({ a = true; b = true; } == { a = true; })'
33
at /pwd/lang/eval-fail-assert-equal-attrs-names.nix:1:1:
4-
1| assert { a = true; b = true; } == { a = true; };
4+
1| assert
55
| ^
6-
2| throw "unreachable"
6+
2| {
77

88
error: attribute names of attribute set '{ a = true; b = true; }' differs from attribute set '{ a = true; }'

‎tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ error:
33
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:1:1:
44
1| assert
55
| ^
6-
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
6+
2| {
77

88
… while comparing attribute 'foo'
99

1010
… where left hand side is
11-
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:2:5:
12-
1| assert
13-
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; }; }
11+
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:3:5:
12+
2| {
13+
3| foo = {
1414
| ^
15-
3| ==
15+
4| type = "derivation";
1616

1717
… where right hand side is
18-
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:4:5:
19-
3| ==
20-
4| { foo = { type = "derivation"; outPath = "/nix/store/1"; devious = true; }; };
18+
at /pwd/lang/eval-fail-assert-equal-derivations-extra.nix:8:5:
19+
7| } == {
20+
8| foo = {
2121
| ^
22-
5| throw "unreachable"
22+
9| type = "derivation";
2323

2424
… while comparing a derivation by its 'outPath' attribute
2525

‎tests/functional/lang/eval-fail-assert-equal-derivations.err.exp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ error:
33
at /pwd/lang/eval-fail-assert-equal-derivations.nix:1:1:
44
1| assert
55
| ^
6-
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
6+
2| {
77

88
… while comparing attribute 'foo'
99

1010
… where left hand side is
11-
at /pwd/lang/eval-fail-assert-equal-derivations.nix:2:5:
12-
1| assert
13-
2| { foo = { type = "derivation"; outPath = "/nix/store/0"; ignored = abort "not ignored"; }; }
11+
at /pwd/lang/eval-fail-assert-equal-derivations.nix:3:5:
12+
2| {
13+
3| foo = {
1414
| ^
15-
3| ==
15+
4| type = "derivation";
1616

1717
… where right hand side is
18-
at /pwd/lang/eval-fail-assert-equal-derivations.nix:4:5:
19-
3| ==
20-
4| { foo = { type = "derivation"; outPath = "/nix/store/1"; ignored = abort "not ignored"; }; };
18+
at /pwd/lang/eval-fail-assert-equal-derivations.nix:9:5:
19+
8| } == {
20+
9| foo = {
2121
| ^
22-
5| throw "unreachable"
22+
10| type = "derivation";
2323

2424
… while comparing a derivation by its 'outPath' attribute
2525

‎tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ error:
22
… while evaluating the condition of the assertion '((x: x) == (x: x))'
33
at /pwd/lang/eval-fail-assert-equal-function-direct.nix:3:1:
44
2| # This only compares a direct comparison and makes no claims about functions in nested structures.
5-
3| assert
5+
3| assert (x: x) == (x: x);
66
| ^
7-
4| (x: x)
7+
4| abort "unreachable"
88

99
error: distinct functions and immediate comparisons of identical functions compare as unequal

‎tests/functional/lang/eval-fail-assert-equal-list-length.err.exp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error:
22
… while evaluating the condition of the assertion '([ (1) (0) ] == [ (10) ])'
33
at /pwd/lang/eval-fail-assert-equal-list-length.nix:1:1:
4-
1| assert [ 1 0 ] == [ 10 ];
4+
1| assert
55
| ^
6-
2| throw "unreachable"
6+
2| [
77

88
error: list of size '2' is not equal to list of size '1', left hand side is '[ 1 0 ]', right hand side is '[ 10 ]'

‎tests/functional/lang/eval-fail-assert-nested-bool.err.exp

Lines changed: 34 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,66 @@
11
error:
22
… while evaluating the condition of the assertion '({ a = { b = [ ({ c = { d = true; }; }) ]; }; } == { a = { b = [ ({ c = { d = false; }; }) ]; }; })'
33
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:1:
4-
1| assert
4+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
55
| ^
6-
2| { a.b = [ { c.d = true; } ]; }
6+
2|
77

88
… while comparing attribute 'a'
99

1010
… where left hand side is
11-
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
12-
1| assert
13-
2| { a.b = [ { c.d = true; } ]; }
14-
| ^
15-
3| ==
11+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
12+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
13+
| ^
14+
2|
1615

1716
… where right hand side is
18-
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
19-
3| ==
20-
4| { a.b = [ { c.d = false; } ]; };
21-
| ^
22-
5|
17+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
18+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
19+
| ^
20+
2|
2321

2422
… while comparing attribute 'b'
2523

2624
… where left hand side is
27-
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:5:
28-
1| assert
29-
2| { a.b = [ { c.d = true; } ]; }
30-
| ^
31-
3| ==
25+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:10:
26+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
27+
| ^
28+
2|
3229

3330
… where right hand side is
34-
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:5:
35-
3| ==
36-
4| { a.b = [ { c.d = false; } ]; };
37-
| ^
38-
5|
31+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:44:
32+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
33+
| ^
34+
2|
3935

4036
… while comparing list element 0
4137

4238
… while comparing attribute 'c'
4339

4440
… where left hand side is
45-
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
46-
1| assert
47-
2| { a.b = [ { c.d = true; } ]; }
48-
| ^
49-
3| ==
41+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
42+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
43+
| ^
44+
2|
5045

5146
… where right hand side is
52-
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
53-
3| ==
54-
4| { a.b = [ { c.d = false; } ]; };
55-
| ^
56-
5|
47+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
48+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
49+
| ^
50+
2|
5751

5852
… while comparing attribute 'd'
5953

6054
… where left hand side is
61-
at /pwd/lang/eval-fail-assert-nested-bool.nix:2:15:
62-
1| assert
63-
2| { a.b = [ { c.d = true; } ]; }
64-
| ^
65-
3| ==
55+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:20:
56+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
57+
| ^
58+
2|
6659

6760
… where right hand side is
68-
at /pwd/lang/eval-fail-assert-nested-bool.nix:4:15:
69-
3| ==
70-
4| { a.b = [ { c.d = false; } ]; };
71-
| ^
72-
5|
61+
at /pwd/lang/eval-fail-assert-nested-bool.nix:1:54:
62+
1| assert { a.b = [ { c.d = true; } ]; } == { a.b = [ { c.d = false; } ]; };
63+
| ^
64+
2|
7365

7466
error: boolean 'true' is not equal to boolean 'false'

‎tests/functional/lang/eval-fail-assert.err.exp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
error:
22
… while evaluating the attribute 'body'
3-
at /pwd/lang/eval-fail-assert.nix:4:3:
4-
3|
5-
4| body = x "x";
3+
at /pwd/lang/eval-fail-assert.nix:7:3:
4+
6|
5+
7| body = x "x";
66
| ^
7-
5| }
7+
8| }
88

99
… from call site
10-
at /pwd/lang/eval-fail-assert.nix:4:10:
11-
3|
12-
4| body = x "x";
10+
at /pwd/lang/eval-fail-assert.nix:7:10:
11+
6|
12+
7| body = x "x";
1313
| ^
14-
5| }
14+
8| }
1515

1616
… while calling 'x'
17-
at /pwd/lang/eval-fail-assert.nix:2:7:
18-
1| let {
19-
2| x = arg: assert arg == "y"; 123;
20-
| ^
21-
3|
17+
at /pwd/lang/eval-fail-assert.nix:3:5:
18+
2| x =
19+
3| arg:
20+
| ^
21+
4| assert arg == "y";
2222

2323
… while evaluating the condition of the assertion '(arg == "y")'
24-
at /pwd/lang/eval-fail-assert.nix:2:12:
25-
1| let {
26-
2| x = arg: assert arg == "y"; 123;
27-
| ^
28-
3|
24+
at /pwd/lang/eval-fail-assert.nix:4:5:
25+
3| arg:
26+
4| assert arg == "y";
27+
| ^
28+
5| 123;
2929

3030
error: string '"x"' is not equal to string '"y"'

‎tests/functional/lang/eval-fail-attr-name-type.err.exp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ error:
22
… while evaluating the attribute 'puppy."${key}"'
33
at /pwd/lang/eval-fail-attr-name-type.nix:3:5:
44
2| attrs = {
5-
3| puppy.doggy = {};
5+
3| puppy.doggy = { };
66
| ^
77
4| };
88

99
… while evaluating an attribute name
10-
at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
10+
at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
1111
6| in
12-
7| attrs.puppy.${key}
13-
| ^
12+
7| attrs.puppy.${key}
13+
| ^
1414
8|
1515

1616
error: expected a string but found an integer: 1
17-
at /pwd/lang/eval-fail-attr-name-type.nix:7:17:
17+
at /pwd/lang/eval-fail-attr-name-type.nix:7:15:
1818
6| in
19-
7| attrs.puppy.${key}
20-
| ^
19+
7| attrs.puppy.${key}
20+
| ^
2121
8|

‎tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
error: undefined variable 'd'
2-
at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:1:26:
3-
1| { a.b = 1; a = rec { c = d + 2; d = 3; }; }.c
4-
| ^
5-
2|
2+
at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:4:9:
3+
3| a = rec {
4+
4| c = d + 2;
5+
| ^
6+
5| d = 3;

‎tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
error:
22
… while evaluating a path segment
3-
at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:9:3:
4-
8| # The error message should not be too long.
5-
9| ''${pkgs}''
3+
at /pwd/lang/eval-fail-bad-string-interpolation-4.nix:19:3:
4+
18| # The error message should not be too long.
5+
19| ''${pkgs}''
66
| ^
7-
10|
7+
20|
88

99
error: cannot coerce a set to a string: { a = { a = { a = { a = "ha"; b = "ha"; c = "ha"; d = "ha"; e = "ha"; f = "ha"; g = "ha"; h = "ha"; j = "ha"; }; «8 attributes elided» }; «8 attributes elided» }; «8 attributes elided» }

‎tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error:
22
… while evaluating the attribute 'set'
33
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:3:
44
1| {
5-
2| set = { "${"" + "b"}" = 1; };
5+
2| set = {
66
| ^
7-
3| set = { "${"b" + ""}" = 2; };
7+
3| "${"" + "b"}" = 1;
88

9-
error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:2:11
10-
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:11:
11-
2| set = { "${"" + "b"}" = 1; };
12-
3| set = { "${"b" + ""}" = 2; };
13-
| ^
14-
4| }
9+
error: dynamic attribute 'b' already defined at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:3:5
10+
at /pwd/lang/eval-fail-dup-dynamic-attrs.nix:6:5:
11+
5| set = {
12+
6| "${"b" + ""}" = 2;
13+
| ^
14+
7| };

0 commit comments

Comments
 (0)