style: format entire depot with nixpkgs-fmt
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
parent
2d10d60fac
commit
aa122cbae7
310 changed files with 7278 additions and 5490 deletions
|
|
@ -10,9 +10,24 @@ let
|
|||
;
|
||||
|
||||
reserved = c: builtins.elem c [
|
||||
"!" "#" "$" "&" "'" "(" ")"
|
||||
"*" "+" "," "/" ":" ";" "="
|
||||
"?" "@" "[" "]"
|
||||
"!"
|
||||
"#"
|
||||
"$"
|
||||
"&"
|
||||
"'"
|
||||
"("
|
||||
")"
|
||||
"*"
|
||||
"+"
|
||||
","
|
||||
"/"
|
||||
":"
|
||||
";"
|
||||
"="
|
||||
"?"
|
||||
"@"
|
||||
"["
|
||||
"]"
|
||||
];
|
||||
|
||||
unreserved = c: char.asciiAlphaNum c
|
||||
|
|
@ -21,11 +36,13 @@ let
|
|||
percentEncode = c:
|
||||
if unreserved c
|
||||
then c
|
||||
else "%" + (string.fit {
|
||||
width = 2;
|
||||
char = "0";
|
||||
side = "left";
|
||||
} (int.toHex (char.ord c)));
|
||||
else "%" + (string.fit
|
||||
{
|
||||
width = 2;
|
||||
char = "0";
|
||||
side = "left";
|
||||
}
|
||||
(int.toHex (char.ord c)));
|
||||
|
||||
encode = { leaveReserved ? false }: s:
|
||||
let
|
||||
|
|
@ -34,7 +51,8 @@ let
|
|||
if leaveReserved && reserved c
|
||||
then c
|
||||
else percentEncode c;
|
||||
in lib.concatStrings (builtins.map tr chars);
|
||||
in
|
||||
lib.concatStrings (builtins.map tr chars);
|
||||
|
||||
decode = s:
|
||||
let
|
||||
|
|
@ -71,9 +89,10 @@ let
|
|||
];
|
||||
|
||||
in
|
||||
(builtins.foldl' decodeStep {} tokens).result;
|
||||
(builtins.foldl' decodeStep { } tokens).result;
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
inherit
|
||||
encode
|
||||
decode
|
||||
|
|
|
|||
|
|
@ -14,11 +14,13 @@ let
|
|||
|
||||
checkEncoding = args: { left, right }:
|
||||
assertEq "encode ${builtins.toJSON left} == ${builtins.toJSON right}"
|
||||
(url.encode args left) right;
|
||||
(url.encode args left)
|
||||
right;
|
||||
|
||||
checkDecoding = { left, right }:
|
||||
assertEq "${builtins.toJSON left} == decode ${builtins.toJSON right}"
|
||||
(url.decode left) right;
|
||||
assertEq "${builtins.toJSON left} == decode ${builtins.toJSON right}"
|
||||
(url.decode left)
|
||||
right;
|
||||
|
||||
unreserved = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_~";
|
||||
|
||||
|
|
@ -33,7 +35,7 @@ let
|
|||
];
|
||||
|
||||
testEncode = it "checks url.encode"
|
||||
(builtins.map (checkEncoding {}) encodeExpected);
|
||||
(builtins.map (checkEncoding { }) encodeExpected);
|
||||
|
||||
testDecode = it "checks url.decode"
|
||||
(builtins.map checkDecoding encodeExpected);
|
||||
|
|
@ -50,7 +52,7 @@ let
|
|||
"urn:oasis:names:specification:docbook:dtd:xml:4.1.2"
|
||||
]);
|
||||
in
|
||||
runTestsuite "nix.url" [
|
||||
testEncode
|
||||
testLeaveReserved
|
||||
]
|
||||
runTestsuite "nix.url" [
|
||||
testEncode
|
||||
testLeaveReserved
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue