git.delta.rocks / jrsonnet / refs/commits / f2ff4e6fd929

difftreelog

fix rowan-related test failures

Yaroslav Bolyukin2024-02-20parent: #86f8537.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
1919
20[[package]]20[[package]]
21name = "ahash"21name = "ahash"
22version = "0.8.6"22version = "0.8.8"
23source = "registry+https://github.com/rust-lang/crates.io-index"23source = "registry+https://github.com/rust-lang/crates.io-index"
24checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"24checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
25dependencies = [25dependencies = [
26 "cfg-if",26 "cfg-if",
27 "once_cell",27 "once_cell",
5656
57[[package]]57[[package]]
58name = "anstream"58name = "anstream"
59version = "0.6.5"59version = "0.6.12"
60source = "registry+https://github.com/rust-lang/crates.io-index"60source = "registry+https://github.com/rust-lang/crates.io-index"
61checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"61checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
62dependencies = [62dependencies = [
63 "anstyle",63 "anstyle",
64 "anstyle-parse",64 "anstyle-parse",
7070
71[[package]]71[[package]]
72name = "anstyle"72name = "anstyle"
73version = "1.0.4"73version = "1.0.6"
74source = "registry+https://github.com/rust-lang/crates.io-index"74source = "registry+https://github.com/rust-lang/crates.io-index"
75checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"75checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
7676
77[[package]]77[[package]]
78name = "anstyle-parse"78name = "anstyle-parse"
89source = "registry+https://github.com/rust-lang/crates.io-index"89source = "registry+https://github.com/rust-lang/crates.io-index"
90checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"90checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
91dependencies = [91dependencies = [
92 "windows-sys 0.52.0",92 "windows-sys",
93]93]
9494
95[[package]]95[[package]]
99checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"99checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
100dependencies = [100dependencies = [
101 "anstyle",101 "anstyle",
102 "windows-sys 0.52.0",102 "windows-sys",
103]103]
104104
105[[package]]105[[package]]
106name = "anyhow"106name = "anyhow"
107version = "1.0.75"107version = "1.0.80"
108source = "registry+https://github.com/rust-lang/crates.io-index"108source = "registry+https://github.com/rust-lang/crates.io-index"
109checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"109checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
110110
111[[package]]111[[package]]
112name = "ass-stroke"112name = "ass-stroke"
152152
153[[package]]153[[package]]
154name = "base64"154name = "base64"
155version = "0.21.5"155version = "0.21.7"
156source = "registry+https://github.com/rust-lang/crates.io-index"156source = "registry+https://github.com/rust-lang/crates.io-index"
157checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"157checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
158158
159[[package]]159[[package]]
160name = "beef"160name = "beef"
179179
180[[package]]180[[package]]
181name = "bitflags"181name = "bitflags"
182version = "2.4.1"182version = "2.4.2"
183source = "registry+https://github.com/rust-lang/crates.io-index"183source = "registry+https://github.com/rust-lang/crates.io-index"
184checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"184checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
185185
186[[package]]186[[package]]
187name = "block-buffer"187name = "block-buffer"
215215
216[[package]]216[[package]]
217name = "clap"217name = "clap"
218version = "4.4.11"218version = "4.5.1"
219source = "registry+https://github.com/rust-lang/crates.io-index"219source = "registry+https://github.com/rust-lang/crates.io-index"
220checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"220checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
221dependencies = [221dependencies = [
222 "clap_builder",222 "clap_builder",
223 "clap_derive",223 "clap_derive",
224]224]
225225
226[[package]]226[[package]]
227name = "clap_builder"227name = "clap_builder"
228version = "4.4.11"228version = "4.5.1"
229source = "registry+https://github.com/rust-lang/crates.io-index"229source = "registry+https://github.com/rust-lang/crates.io-index"
230checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"230checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
231dependencies = [231dependencies = [
232 "anstream",232 "anstream",
233 "anstyle",233 "anstyle",
234 "clap_lex",234 "clap_lex",
235 "strsim",235 "strsim 0.11.0",
236]236]
237237
238[[package]]238[[package]]
239name = "clap_complete"239name = "clap_complete"
240version = "4.4.4"240version = "4.5.1"
241source = "registry+https://github.com/rust-lang/crates.io-index"241source = "registry+https://github.com/rust-lang/crates.io-index"
242checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae"242checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
243dependencies = [243dependencies = [
244 "clap",244 "clap",
245]245]
246246
247[[package]]247[[package]]
248name = "clap_derive"248name = "clap_derive"
249version = "4.4.7"249version = "4.5.0"
250source = "registry+https://github.com/rust-lang/crates.io-index"250source = "registry+https://github.com/rust-lang/crates.io-index"
251checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"251checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
252dependencies = [252dependencies = [
253 "heck",253 "heck",
254 "proc-macro2",254 "proc-macro2",
255 "quote",255 "quote",
256 "syn 2.0.39",256 "syn 2.0.50",
257]257]
258258
259[[package]]259[[package]]
260name = "clap_lex"260name = "clap_lex"
261version = "0.6.0"261version = "0.7.0"
262source = "registry+https://github.com/rust-lang/crates.io-index"262source = "registry+https://github.com/rust-lang/crates.io-index"
263checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"263checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
264264
265[[package]]265[[package]]
266name = "colorchoice"266name = "colorchoice"
270270
271[[package]]271[[package]]
272name = "console"272name = "console"
273version = "0.15.7"273version = "0.15.8"
274source = "registry+https://github.com/rust-lang/crates.io-index"274source = "registry+https://github.com/rust-lang/crates.io-index"
275checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"275checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
276dependencies = [276dependencies = [
277 "encode_unicode",277 "encode_unicode",
278 "lazy_static",278 "lazy_static",
279 "libc",279 "libc",
280 "windows-sys 0.45.0",280 "windows-sys",
281]281]
282282
283[[package]]283[[package]]
288288
289[[package]]289[[package]]
290name = "cpufeatures"290name = "cpufeatures"
291version = "0.2.11"291version = "0.2.12"
292source = "registry+https://github.com/rust-lang/crates.io-index"292source = "registry+https://github.com/rust-lang/crates.io-index"
293checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"293checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
294dependencies = [294dependencies = [
295 "libc",295 "libc",
296]296]
297297
298[[package]]298[[package]]
299name = "crossbeam-channel"299name = "crossbeam-channel"
300version = "0.5.8"300version = "0.5.11"
301source = "registry+https://github.com/rust-lang/crates.io-index"301source = "registry+https://github.com/rust-lang/crates.io-index"
302checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"302checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
303dependencies = [303dependencies = [
304 "cfg-if",
305 "crossbeam-utils",304 "crossbeam-utils",
306]305]
307306
308[[package]]307[[package]]
309name = "crossbeam-utils"308name = "crossbeam-utils"
310version = "0.8.16"309version = "0.8.19"
311source = "registry+https://github.com/rust-lang/crates.io-index"310source = "registry+https://github.com/rust-lang/crates.io-index"
312checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"311checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
313dependencies = [
314 "cfg-if",
315]
316312
317[[package]]313[[package]]
318name = "crypto-common"314name = "crypto-common"
353dependencies = [349dependencies = [
354 "anyhow",350 "anyhow",
355 "bumpalo",351 "bumpalo",
356 "indexmap 2.1.0",352 "indexmap 2.2.3",
357 "rustc-hash",353 "rustc-hash",
358 "serde",354 "serde",
359 "unicode-width",355 "unicode-width",
390checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"386checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
391dependencies = [387dependencies = [
392 "libc",388 "libc",
393 "windows-sys 0.52.0",389 "windows-sys",
394]390]
395391
396[[package]]392[[package]]
485481
486[[package]]482[[package]]
487name = "hermit-abi"483name = "hermit-abi"
488version = "0.3.3"484version = "0.3.6"
489source = "registry+https://github.com/rust-lang/crates.io-index"485source = "registry+https://github.com/rust-lang/crates.io-index"
490checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"486checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
491487
492[[package]]488[[package]]
493name = "idna"489name = "idna"
511507
512[[package]]508[[package]]
513name = "indexmap"509name = "indexmap"
514version = "2.1.0"510version = "2.2.3"
515source = "registry+https://github.com/rust-lang/crates.io-index"511source = "registry+https://github.com/rust-lang/crates.io-index"
516checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"512checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
517dependencies = [513dependencies = [
518 "equivalent",514 "equivalent",
519 "hashbrown 0.14.3",515 "hashbrown 0.14.3",
528524
529[[package]]525[[package]]
530name = "insta"526name = "insta"
531version = "1.34.0"527version = "1.35.1"
532source = "registry+https://github.com/rust-lang/crates.io-index"528source = "registry+https://github.com/rust-lang/crates.io-index"
533checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"529checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2"
534dependencies = [530dependencies = [
535 "console",531 "console",
536 "lazy_static",532 "lazy_static",
541537
542[[package]]538[[package]]
543name = "is-terminal"539name = "is-terminal"
544version = "0.4.9"540version = "0.4.12"
545source = "registry+https://github.com/rust-lang/crates.io-index"541source = "registry+https://github.com/rust-lang/crates.io-index"
546checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"542checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
547dependencies = [543dependencies = [
548 "hermit-abi",544 "hermit-abi",
549 "rustix",545 "libc",
550 "windows-sys 0.48.0",546 "windows-sys",
551]547]
552548
553[[package]]549[[package]]
554name = "is_ci"550name = "is_ci"
555version = "1.1.1"551version = "1.2.0"
556source = "registry+https://github.com/rust-lang/crates.io-index"552source = "registry+https://github.com/rust-lang/crates.io-index"
557checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"553checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
558554
559[[package]]555[[package]]
560name = "itertools"556name = "itertools"
618 "rustc-hash",614 "rustc-hash",
619 "serde",615 "serde",
620 "static_assertions",616 "static_assertions",
621 "strsim",617 "strsim 0.10.0",
622 "thiserror",618 "thiserror",
623]619]
624620
687dependencies = [683dependencies = [
688 "proc-macro2",684 "proc-macro2",
689 "quote",685 "quote",
690 "syn 2.0.39",686 "syn 2.0.50",
691]687]
692688
693[[package]]689[[package]]
766762
767[[package]]763[[package]]
768name = "libc"764name = "libc"
769version = "0.2.151"765version = "0.2.153"
770source = "registry+https://github.com/rust-lang/crates.io-index"766source = "registry+https://github.com/rust-lang/crates.io-index"
771checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"767checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
772768
773[[package]]769[[package]]
774name = "libjsonnet"770name = "libjsonnet"
788784
789[[package]]785[[package]]
790name = "linux-raw-sys"786name = "linux-raw-sys"
791version = "0.4.12"787version = "0.4.13"
792source = "registry+https://github.com/rust-lang/crates.io-index"788source = "registry+https://github.com/rust-lang/crates.io-index"
793checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"789checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
794790
795[[package]]791[[package]]
796name = "lock_api"792name = "lock_api"
842838
843[[package]]839[[package]]
844name = "lsp-server"840name = "lsp-server"
845version = "0.7.5"841version = "0.7.6"
846source = "registry+https://github.com/rust-lang/crates.io-index"842source = "registry+https://github.com/rust-lang/crates.io-index"
847checksum = "fb69ba934913ebf0ef3b3dd762f0149bf993decd571d094b646de09c2e456732"843checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
848dependencies = [844dependencies = [
849 "crossbeam-channel",845 "crossbeam-channel",
850 "log",846 "log",
873869
874[[package]]870[[package]]
875name = "memchr"871name = "memchr"
876version = "2.6.4"872version = "2.7.1"
877source = "registry+https://github.com/rust-lang/crates.io-index"873source = "registry+https://github.com/rust-lang/crates.io-index"
878checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"874checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
879875
880[[package]]876[[package]]
881name = "memoffset"877name = "memoffset"
915dependencies = [911dependencies = [
916 "proc-macro2",912 "proc-macro2",
917 "quote",913 "quote",
918 "syn 2.0.39",914 "syn 2.0.50",
919]915]
920916
921[[package]]917[[package]]
939935
940[[package]]936[[package]]
941name = "miniz_oxide"937name = "miniz_oxide"
942version = "0.7.1"938version = "0.7.2"
943source = "registry+https://github.com/rust-lang/crates.io-index"939source = "registry+https://github.com/rust-lang/crates.io-index"
944checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"940checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
945dependencies = [941dependencies = [
946 "adler",942 "adler",
947]943]
960956
961[[package]]957[[package]]
962name = "num-integer"958name = "num-integer"
963version = "0.1.45"959version = "0.1.46"
964source = "registry+https://github.com/rust-lang/crates.io-index"960source = "registry+https://github.com/rust-lang/crates.io-index"
965checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"961checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
966dependencies = [962dependencies = [
967 "autocfg",
968 "num-traits",963 "num-traits",
969]964]
970965
971[[package]]966[[package]]
972name = "num-traits"967name = "num-traits"
973version = "0.2.17"968version = "0.2.18"
974source = "registry+https://github.com/rust-lang/crates.io-index"969source = "registry+https://github.com/rust-lang/crates.io-index"
975checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"970checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
976dependencies = [971dependencies = [
977 "autocfg",972 "autocfg",
978]973]
979974
980[[package]]975[[package]]
981name = "object"976name = "object"
982version = "0.32.1"977version = "0.32.2"
983source = "registry+https://github.com/rust-lang/crates.io-index"978source = "registry+https://github.com/rust-lang/crates.io-index"
984checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"979checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
985dependencies = [980dependencies = [
986 "memchr",981 "memchr",
987]982]
10681063
1069[[package]]1064[[package]]
1070name = "proc-macro2"1065name = "proc-macro2"
1071version = "1.0.70"1066version = "1.0.78"
1072source = "registry+https://github.com/rust-lang/crates.io-index"1067source = "registry+https://github.com/rust-lang/crates.io-index"
1073checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"1068checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
1074dependencies = [1069dependencies = [
1075 "unicode-ident",1070 "unicode-ident",
1076]1071]
10771072
1078[[package]]1073[[package]]
1079name = "quote"1074name = "quote"
1080version = "1.0.33"1075version = "1.0.35"
1081source = "registry+https://github.com/rust-lang/crates.io-index"1076source = "registry+https://github.com/rust-lang/crates.io-index"
1082checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"1077checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
1083dependencies = [1078dependencies = [
1084 "proc-macro2",1079 "proc-macro2",
1085]1080]
11941189
1195[[package]]1190[[package]]
1196name = "regex"1191name = "regex"
1197version = "1.10.2"1192version = "1.10.3"
1198source = "registry+https://github.com/rust-lang/crates.io-index"1193source = "registry+https://github.com/rust-lang/crates.io-index"
1199checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"1194checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
1200dependencies = [1195dependencies = [
1201 "aho-corasick",1196 "aho-corasick",
1202 "memchr",1197 "memchr",
12061201
1207[[package]]1202[[package]]
1208name = "regex-automata"1203name = "regex-automata"
1209version = "0.4.3"1204version = "0.4.5"
1210source = "registry+https://github.com/rust-lang/crates.io-index"1205source = "registry+https://github.com/rust-lang/crates.io-index"
1211checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"1206checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
1212dependencies = [1207dependencies = [
1213 "aho-corasick",1208 "aho-corasick",
1214 "memchr",1209 "memchr",
12541249
1255[[package]]1250[[package]]
1256name = "rustix"1251name = "rustix"
1257version = "0.38.28"1252version = "0.38.31"
1258source = "registry+https://github.com/rust-lang/crates.io-index"1253source = "registry+https://github.com/rust-lang/crates.io-index"
1259checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"1254checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
1260dependencies = [1255dependencies = [
1261 "bitflags 2.4.1",1256 "bitflags 2.4.2",
1262 "errno",1257 "errno",
1263 "libc",1258 "libc",
1264 "linux-raw-sys",1259 "linux-raw-sys",
1265 "windows-sys 0.52.0",1260 "windows-sys",
1266]1261]
12671262
1268[[package]]1263[[package]]
12791274
1280[[package]]1275[[package]]
1281name = "serde"1276name = "serde"
1282version = "1.0.193"1277version = "1.0.197"
1283source = "registry+https://github.com/rust-lang/crates.io-index"1278source = "registry+https://github.com/rust-lang/crates.io-index"
1284checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"1279checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
1285dependencies = [1280dependencies = [
1286 "serde_derive",1281 "serde_derive",
1287]1282]
12881283
1289[[package]]1284[[package]]
1290name = "serde_derive"1285name = "serde_derive"
1291version = "1.0.193"1286version = "1.0.197"
1292source = "registry+https://github.com/rust-lang/crates.io-index"1287source = "registry+https://github.com/rust-lang/crates.io-index"
1293checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"1288checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
1294dependencies = [1289dependencies = [
1295 "proc-macro2",1290 "proc-macro2",
1296 "quote",1291 "quote",
1297 "syn 2.0.39",1292 "syn 2.0.50",
1298]1293]
12991294
1300[[package]]1295[[package]]
1301name = "serde_json"1296name = "serde_json"
1302version = "1.0.108"1297version = "1.0.114"
1303source = "registry+https://github.com/rust-lang/crates.io-index"1298source = "registry+https://github.com/rust-lang/crates.io-index"
1304checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"1299checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
1305dependencies = [1300dependencies = [
1306 "itoa",1301 "itoa",
1307 "ryu",1302 "ryu",
1316dependencies = [1311dependencies = [
1317 "proc-macro2",1312 "proc-macro2",
1318 "quote",1313 "quote",
1319 "syn 2.0.39",1314 "syn 2.0.50",
1320]1315]
13211316
1322[[package]]1317[[package]]
13651360
1366[[package]]1361[[package]]
1367name = "similar"1362name = "similar"
1368version = "2.3.0"1363version = "2.4.0"
1369source = "registry+https://github.com/rust-lang/crates.io-index"1364source = "registry+https://github.com/rust-lang/crates.io-index"
1370checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"1365checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
13711366
1372[[package]]1367[[package]]
1373name = "smallvec"1368name = "smallvec"
1393source = "registry+https://github.com/rust-lang/crates.io-index"1388source = "registry+https://github.com/rust-lang/crates.io-index"
1394checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"1389checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
1390
1391[[package]]
1392name = "strsim"
1393version = "0.11.0"
1394source = "registry+https://github.com/rust-lang/crates.io-index"
1395checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
13951396
1396[[package]]1397[[package]]
1397name = "structdump"1398name = "structdump"
14561457
1457[[package]]1458[[package]]
1458name = "syn"1459name = "syn"
1459version = "2.0.39"1460version = "2.0.50"
1460source = "registry+https://github.com/rust-lang/crates.io-index"1461source = "registry+https://github.com/rust-lang/crates.io-index"
1461checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"1462checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
1462dependencies = [1463dependencies = [
1463 "proc-macro2",1464 "proc-macro2",
1464 "quote",1465 "quote",
14671468
1468[[package]]1469[[package]]
1469name = "tempfile"1470name = "tempfile"
1470version = "3.8.1"1471version = "3.10.0"
1471source = "registry+https://github.com/rust-lang/crates.io-index"1472source = "registry+https://github.com/rust-lang/crates.io-index"
1472checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"1473checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
1473dependencies = [1474dependencies = [
1474 "cfg-if",1475 "cfg-if",
1475 "fastrand",1476 "fastrand",
1476 "redox_syscall",
1477 "rustix",1477 "rustix",
1478 "windows-sys 0.48.0",1478 "windows-sys",
1479]1479]
14801480
1481[[package]]1481[[package]]
15171517
1518[[package]]1518[[package]]
1519name = "thiserror"1519name = "thiserror"
1520version = "1.0.50"1520version = "1.0.57"
1521source = "registry+https://github.com/rust-lang/crates.io-index"1521source = "registry+https://github.com/rust-lang/crates.io-index"
1522checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"1522checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
1523dependencies = [1523dependencies = [
1524 "thiserror-impl",1524 "thiserror-impl",
1525]1525]
15261526
1527[[package]]1527[[package]]
1528name = "thiserror-impl"1528name = "thiserror-impl"
1529version = "1.0.50"1529version = "1.0.57"
1530source = "registry+https://github.com/rust-lang/crates.io-index"1530source = "registry+https://github.com/rust-lang/crates.io-index"
1531checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"1531checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
1532dependencies = [1532dependencies = [
1533 "proc-macro2",1533 "proc-macro2",
1534 "quote",1534 "quote",
1535 "syn 2.0.39",1535 "syn 2.0.50",
1536]1536]
15371537
1538[[package]]1538[[package]]
1653source = "registry+https://github.com/rust-lang/crates.io-index"1653source = "registry+https://github.com/rust-lang/crates.io-index"
1654checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"1654checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
1655
1656[[package]]
1657name = "windows-sys"
1658version = "0.45.0"
1659source = "registry+https://github.com/rust-lang/crates.io-index"
1660checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
1661dependencies = [
1662 "windows-targets 0.42.2",
1663]
1664
1665[[package]]
1666name = "windows-sys"
1667version = "0.48.0"
1668source = "registry+https://github.com/rust-lang/crates.io-index"
1669checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
1670dependencies = [
1671 "windows-targets 0.48.5",
1672]
16731655
1674[[package]]1656[[package]]
1675name = "windows-sys"1657name = "windows-sys"
1680 "windows-targets 0.52.0",1662 "windows-targets 0.52.0",
1681]1663]
1682
1683[[package]]
1684name = "windows-targets"
1685version = "0.42.2"
1686source = "registry+https://github.com/rust-lang/crates.io-index"
1687checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
1688dependencies = [
1689 "windows_aarch64_gnullvm 0.42.2",
1690 "windows_aarch64_msvc 0.42.2",
1691 "windows_i686_gnu 0.42.2",
1692 "windows_i686_msvc 0.42.2",
1693 "windows_x86_64_gnu 0.42.2",
1694 "windows_x86_64_gnullvm 0.42.2",
1695 "windows_x86_64_msvc 0.42.2",
1696]
16971664
1698[[package]]1665[[package]]
1699name = "windows-targets"1666name = "windows-targets"
1725 "windows_x86_64_msvc 0.52.0",1692 "windows_x86_64_msvc 0.52.0",
1726]1693]
1727
1728[[package]]
1729name = "windows_aarch64_gnullvm"
1730version = "0.42.2"
1731source = "registry+https://github.com/rust-lang/crates.io-index"
1732checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
17331694
1734[[package]]1695[[package]]
1735name = "windows_aarch64_gnullvm"1696name = "windows_aarch64_gnullvm"
1743source = "registry+https://github.com/rust-lang/crates.io-index"1704source = "registry+https://github.com/rust-lang/crates.io-index"
1744checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"1705checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
1745
1746[[package]]
1747name = "windows_aarch64_msvc"
1748version = "0.42.2"
1749source = "registry+https://github.com/rust-lang/crates.io-index"
1750checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
17511706
1752[[package]]1707[[package]]
1753name = "windows_aarch64_msvc"1708name = "windows_aarch64_msvc"
1761source = "registry+https://github.com/rust-lang/crates.io-index"1716source = "registry+https://github.com/rust-lang/crates.io-index"
1762checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"1717checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
1763
1764[[package]]
1765name = "windows_i686_gnu"
1766version = "0.42.2"
1767source = "registry+https://github.com/rust-lang/crates.io-index"
1768checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
17691718
1770[[package]]1719[[package]]
1771name = "windows_i686_gnu"1720name = "windows_i686_gnu"
1779source = "registry+https://github.com/rust-lang/crates.io-index"1728source = "registry+https://github.com/rust-lang/crates.io-index"
1780checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"1729checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
1781
1782[[package]]
1783name = "windows_i686_msvc"
1784version = "0.42.2"
1785source = "registry+https://github.com/rust-lang/crates.io-index"
1786checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
17871730
1788[[package]]1731[[package]]
1789name = "windows_i686_msvc"1732name = "windows_i686_msvc"
1797source = "registry+https://github.com/rust-lang/crates.io-index"1740source = "registry+https://github.com/rust-lang/crates.io-index"
1798checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"1741checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
1799
1800[[package]]
1801name = "windows_x86_64_gnu"
1802version = "0.42.2"
1803source = "registry+https://github.com/rust-lang/crates.io-index"
1804checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
18051742
1806[[package]]1743[[package]]
1807name = "windows_x86_64_gnu"1744name = "windows_x86_64_gnu"
1815source = "registry+https://github.com/rust-lang/crates.io-index"1752source = "registry+https://github.com/rust-lang/crates.io-index"
1816checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"1753checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
1817
1818[[package]]
1819name = "windows_x86_64_gnullvm"
1820version = "0.42.2"
1821source = "registry+https://github.com/rust-lang/crates.io-index"
1822checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
18231754
1824[[package]]1755[[package]]
1825name = "windows_x86_64_gnullvm"1756name = "windows_x86_64_gnullvm"
1833source = "registry+https://github.com/rust-lang/crates.io-index"1764source = "registry+https://github.com/rust-lang/crates.io-index"
1834checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"1765checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
1835
1836[[package]]
1837name = "windows_x86_64_msvc"
1838version = "0.42.2"
1839source = "registry+https://github.com/rust-lang/crates.io-index"
1840checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
18411766
1842[[package]]1767[[package]]
1843name = "windows_x86_64_msvc"1768name = "windows_x86_64_msvc"
1871version = "0.1.0"1796version = "0.1.0"
1872dependencies = [1797dependencies = [
1873 "anyhow",1798 "anyhow",
1874 "indexmap 2.1.0",1799 "indexmap 2.2.3",
1875 "itertools",1800 "itertools",
1876 "proc-macro2",1801 "proc-macro2",
1877 "quote",1802 "quote",
18991824
1900[[package]]1825[[package]]
1901name = "zerocopy"1826name = "zerocopy"
1902version = "0.7.30"1827version = "0.7.32"
1903source = "registry+https://github.com/rust-lang/crates.io-index"1828source = "registry+https://github.com/rust-lang/crates.io-index"
1904checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"1829checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
1905dependencies = [1830dependencies = [
1906 "zerocopy-derive",1831 "zerocopy-derive",
1907]1832]
19081833
1909[[package]]1834[[package]]
1910name = "zerocopy-derive"1835name = "zerocopy-derive"
1911version = "0.7.30"1836version = "0.7.32"
1912source = "registry+https://github.com/rust-lang/crates.io-index"1837source = "registry+https://github.com/rust-lang/crates.io-index"
1913checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"1838checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
1914dependencies = [1839dependencies = [
1915 "proc-macro2",1840 "proc-macro2",
1916 "quote",1841 "quote",
1917 "syn 2.0.39",1842 "syn 2.0.50",
1918]1843]
19191844
modifiedCargo.tomldiffbeforeafterboth
18jrsonnet-gcmodule = "0.3.6"18jrsonnet-gcmodule = "0.3.6"
19ass-stroke = { git = "https://github.com/CertainLach/ass-stroke", version = "0.1.0" }19ass-stroke = { git = "https://github.com/CertainLach/ass-stroke", version = "0.1.0" }
2020
21serde = "1.0.190"21serde = "1.0.197"
22serde_json = "1.0.107"22serde_json = "1.0.114"
23serde_yaml_with_quirks = "0.8.24"23serde_yaml_with_quirks = "0.8.24"
2424
25anyhow = "1.0.48"25anyhow = "1.0.80"
26thiserror = "1.0"26thiserror = "1.0"
27mimallocator = "0.1.3"27mimallocator = "0.1.3"
28indoc = "2.0"28indoc = "2.0"
29dprint-core = "0.63.2"29dprint-core = "0.63.3"
30insta = "1.15"30insta = "1.35"
31tempfile = "3.8"31tempfile = "3.10"
32pathdiff = "0.2.1"32pathdiff = "0.2.1"
33hashbrown = "0.14.2"33hashbrown = "0.14.3"
34static_assertions = "1.1"34static_assertions = "1.1"
35rustc-hash = "1.1"35rustc-hash = "1.1"
36bincode = "1.3"36bincode = "1.3"
37annotate-snippets = "0.9.1"37annotate-snippets = "0.9.2"
38num-bigint = "0.4.3"38num-bigint = "0.4.4"
39derivative = "2.2.0"39derivative = "2.2.0"
40strsim = "0.10.0"40strsim = "0.10.0"
41structdump = "0.2.0"41structdump = "0.2.0"
44syn = "2.0"44syn = "2.0"
45peg = "0.8.2"45peg = "0.8.2"
46drop_bomb = "0.1.5"46drop_bomb = "0.1.5"
47logos = "0.12.0"47logos = "0.12.1"
48miette = "5.5.0"48miette = "5.10.0"
49rowan = "0.15"49rowan = "0.15"
50text-size = "1.1"50text-size = "1.1"
51md5 = "0.7.0"51md5 = "0.7.0"
52sha1 = "0.10.5"52sha1 = "0.10.6"
53sha2 = "0.10.6"53sha2 = "0.10.8"
54sha3 = "0.10.8"54sha3 = "0.10.8"
55base64 = "0.21.0"55base64 = "0.21.7"
56indexmap = "2.0.2"56indexmap = "2.2.3"
57itertools = "0.11.0"57itertools = "0.11.0"
58ungrammar = "1.16.1"58ungrammar = "1.16.1"
59xshell = "0.2.2"59xshell = "0.2.5"
6060
61clap = "4.4"61clap = "4.5"
62clap_complete = "4.4"62clap_complete = "4.5"
6363
64lsp-server = "0.7.4"64lsp-server = "0.7.6"
65lsp-types = "0.94.1"65lsp-types = "0.94.1"
6666
67regex = "1.8.4"67regex = "1.10.3"
68lru = "0.10.0"68lru = "0.10.1"
6969
70#[profile.test]70#[profile.test]
71#opt-level = 171#opt-level = 1
modifiedcmds/jrsonnet-fmt/src/children.rsdiffbeforeafterboth
60	out60	out
61}61}
62
63pub fn trivia_between(
64	node: SyntaxNode,
65	start: Option<&SyntaxElement>,
66	end: Option<&SyntaxElement>,
67) -> EndingComments {
68	let mut iter = node.children_with_tokens().peekable();
69	while iter.peek() != start {
70		iter.next();
71	}
72	iter.next();
73
74	let loose = start.is_none() || end.is_none();
75
76	let mut out = Vec::new();
77	for item in iter.take_while(|i| Some(i) != end) {
78		if let Some(trivia) = item.as_token().cloned().and_then(Trivia::cast) {
79			out.push(Ok(trivia));
80		} else if CustomError::can_cast(item.kind()) {
81			out.push(Err(item.to_string()))
82		} else if loose {
83			break;
84		} else {
85			assert!(
86				TS![, ;].contains(item.kind()),
87				"silently eaten token: {:?}",
88				item.kind()
89			)
90		}
91	}
92	EndingComments {
93		should_start_with_newline: should_start_with_newline(None, &out),
94		trivia: out,
95	}
96}
9762
98pub fn children_between<T: AstNode + Debug>(63pub fn children_between<T: AstNode + Debug>(
99	node: SyntaxNode,64	node: SyntaxNode,
modifiedcmds/jrsonnet-fmt/src/main.rsdiffbeforeafterboth
20};20};
2121
22use crate::{22use crate::{
23	children::{trivia_after, trivia_between},23	children::trivia_after,
24	comments::{format_comments, CommentLocation},24	comments::{format_comments, CommentLocation},
25};25};
2626
modifiedcmds/jrsonnet-lsp/src/main.rsdiffbeforeafterboth
13	let mut log = File::create("test").unwrap();13	let mut log = File::create("test").unwrap();
14	writeln!(log, "start").unwrap();14	writeln!(log, "start").unwrap();
15	let (connection, io_threads) = Connection::stdio();15	let (connection, io_threads) = Connection::stdio();
16	let capabilities = serde_json::to_value(&ServerCapabilities {16	let capabilities = serde_json::to_value(ServerCapabilities {
17		completion_provider: Some(CompletionOptions::default()),17		completion_provider: Some(CompletionOptions::default()),
18		definition_provider: Some(lsp_types::OneOf::Left(true)),18		definition_provider: Some(lsp_types::OneOf::Left(true)),
19		document_link_provider: Some(DocumentLinkOptions {19		document_link_provider: Some(DocumentLinkOptions {
modifiedcrates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rsdiffbeforeafterboth
290}290}
291#[macro_export]291#[macro_export]
292macro_rules ! T { [||] => { $ crate :: SyntaxKind :: OR } ; [??] => { $ crate :: SyntaxKind :: NULL_COAELSE } ; [&&] => { $ crate :: SyntaxKind :: AND } ; [|] => { $ crate :: SyntaxKind :: BIT_OR } ; [^] => { $ crate :: SyntaxKind :: BIT_XOR } ; [&] => { $ crate :: SyntaxKind :: BIT_AND } ; [==] => { $ crate :: SyntaxKind :: EQ } ; [!=] => { $ crate :: SyntaxKind :: NE } ; [<] => { $ crate :: SyntaxKind :: LT } ; [>] => { $ crate :: SyntaxKind :: GT } ; [<=] => { $ crate :: SyntaxKind :: LE } ; [>=] => { $ crate :: SyntaxKind :: GE } ; [<<] => { $ crate :: SyntaxKind :: LHS } ; [>>] => { $ crate :: SyntaxKind :: RHS } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [*] => { $ crate :: SyntaxKind :: MUL } ; [/] => { $ crate :: SyntaxKind :: DIV } ; [%] => { $ crate :: SyntaxKind :: MODULO } ; [!] => { $ crate :: SyntaxKind :: NOT } ; [~] => { $ crate :: SyntaxKind :: BIT_NOT } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_BRACE } ; ['}'] => { $ crate :: SyntaxKind :: R_BRACE } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [::] => { $ crate :: SyntaxKind :: COLONCOLON } ; [:::] => { $ crate :: SyntaxKind :: COLONCOLONCOLON } ; [;] => { $ crate :: SyntaxKind :: SEMI } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOTDOTDOT } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['$'] => { $ crate :: SyntaxKind :: DOLLAR } ; [=] => { $ crate :: SyntaxKind :: ASSIGN } ; [?] => { $ crate :: SyntaxKind :: QUESTION_MARK } ; [tailstrict] => { $ crate :: SyntaxKind :: TAILSTRICT_KW } ; [local] => { $ crate :: SyntaxKind :: LOCAL_KW } ; [importstr] => { $ crate :: SyntaxKind :: IMPORTSTR_KW } ; [importbin] => { $ crate :: SyntaxKind :: IMPORTBIN_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [then] => { $ crate :: SyntaxKind :: THEN_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [error] => { $ crate :: SyntaxKind :: ERROR_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [self] => { $ crate :: SyntaxKind :: SELF_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } }292macro_rules ! T { [||] => { $ crate :: SyntaxKind :: OR } ; [??] => { $ crate :: SyntaxKind :: NULL_COAELSE } ; [&&] => { $ crate :: SyntaxKind :: AND } ; [|] => { $ crate :: SyntaxKind :: BIT_OR } ; [^] => { $ crate :: SyntaxKind :: BIT_XOR } ; [&] => { $ crate :: SyntaxKind :: BIT_AND } ; [==] => { $ crate :: SyntaxKind :: EQ } ; [!=] => { $ crate :: SyntaxKind :: NE } ; [<] => { $ crate :: SyntaxKind :: LT } ; [>] => { $ crate :: SyntaxKind :: GT } ; [<=] => { $ crate :: SyntaxKind :: LE } ; [>=] => { $ crate :: SyntaxKind :: GE } ; [<<] => { $ crate :: SyntaxKind :: LHS } ; [>>] => { $ crate :: SyntaxKind :: RHS } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [*] => { $ crate :: SyntaxKind :: MUL } ; [/] => { $ crate :: SyntaxKind :: DIV } ; [%] => { $ crate :: SyntaxKind :: MODULO } ; [!] => { $ crate :: SyntaxKind :: NOT } ; [~] => { $ crate :: SyntaxKind :: BIT_NOT } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_BRACE } ; ['}'] => { $ crate :: SyntaxKind :: R_BRACE } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [::] => { $ crate :: SyntaxKind :: COLONCOLON } ; [:::] => { $ crate :: SyntaxKind :: COLONCOLONCOLON } ; [;] => { $ crate :: SyntaxKind :: SEMI } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOTDOTDOT } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['$'] => { $ crate :: SyntaxKind :: DOLLAR } ; [=] => { $ crate :: SyntaxKind :: ASSIGN } ; [?] => { $ crate :: SyntaxKind :: QUESTION_MARK } ; [tailstrict] => { $ crate :: SyntaxKind :: TAILSTRICT_KW } ; [local] => { $ crate :: SyntaxKind :: LOCAL_KW } ; [importstr] => { $ crate :: SyntaxKind :: IMPORTSTR_KW } ; [importbin] => { $ crate :: SyntaxKind :: IMPORTBIN_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [then] => { $ crate :: SyntaxKind :: THEN_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [error] => { $ crate :: SyntaxKind :: ERROR_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [self] => { $ crate :: SyntaxKind :: SELF_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } }
293#[allow(unused_imports)]
293pub use T;294pub use T;
294295
modifiedxtask/src/sourcegen/ast.rsdiffbeforeafterboth
148					lower_rule(&mut fields, grammar, None, rule, false);148					lower_rule(&mut fields, grammar, None, rule, false);
149					let mut types = HashMap::new();149					let mut types = HashMap::new();
150					for field in fields.iter().filter(|f| f.token_name().is_none()) {150					for field in fields.iter().filter(|f| f.token_name().is_none()) {
151						if let Some(old) = types.insert(field.ty(), field.method_name(kinds)) {151						if let Some(_old) = types.insert(field.ty(), field.method_name(kinds)) {
152							// panic!("{name}.{} has same type as {name}.{}, resolve conflict by wrapping one field: {}", old, field.method_name(kinds), field.ty());152							// panic!("{name}.{} has same type as {name}.{}, resolve conflict by wrapping one field: {}", old, field.method_name(kinds), field.ty());
153						}153						}
154						// TODO: check for assignable field types, i.e you can have154						// TODO: check for assignable field types, i.e you can have
modifiedxtask/src/sourcegen/mod.rsdiffbeforeafterboth
183183
184		#[macro_export]184		#[macro_export]
185		macro_rules! T {#(#t_macros);*}185		macro_rules! T {#(#t_macros);*}
186		#[allow(unused_imports)]
186		pub use T;187		pub use T;
187	};188	};
188189