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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -56,9 +56,9 @@
 
 [[package]]
 name = "anstream"
-version = "0.6.5"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
+checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -70,9 +70,9 @@
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -89,7 +89,7 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -99,14 +99,14 @@
 checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "ass-stroke"
@@ -152,9 +152,9 @@
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "beef"
@@ -179,9 +179,9 @@
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "block-buffer"
@@ -215,9 +215,9 @@
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -225,42 +225,42 @@
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim",
+ "strsim 0.11.0",
 ]
 
 [[package]]
 name = "clap_complete"
-version = "4.4.4"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae"
+checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
@@ -270,14 +270,14 @@
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -288,31 +288,27 @@
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crypto-common"
@@ -353,7 +349,7 @@
 dependencies = [
  "anyhow",
  "bumpalo",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "rustc-hash",
  "serde",
  "unicode-width",
@@ -390,7 +386,7 @@
 checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -485,9 +481,9 @@
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
 
 [[package]]
 name = "idna"
@@ -511,9 +507,9 @@
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -528,9 +524,9 @@
 
 [[package]]
 name = "insta"
-version = "1.34.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
+checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2"
 dependencies = [
  "console",
  "lazy_static",
@@ -541,20 +537,20 @@
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
- "rustix",
- "windows-sys 0.48.0",
+ "libc",
+ "windows-sys",
 ]
 
 [[package]]
 name = "is_ci"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
+checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "itertools"
@@ -618,7 +614,7 @@
  "rustc-hash",
  "serde",
  "static_assertions",
- "strsim",
+ "strsim 0.10.0",
  "thiserror",
 ]
 
@@ -687,7 +683,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -766,9 +762,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libjsonnet"
@@ -788,9 +784,9 @@
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -842,9 +838,9 @@
 
 [[package]]
 name = "lsp-server"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb69ba934913ebf0ef3b3dd762f0149bf993decd571d094b646de09c2e456732"
+checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -873,9 +869,9 @@
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memoffset"
@@ -915,7 +911,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -939,9 +935,9 @@
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -960,28 +956,27 @@
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -1068,18 +1063,18 @@
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -1194,9 +1189,9 @@
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1206,9 +1201,9 @@
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1254,15 +1249,15 @@
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1279,29 +1274,29 @@
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -1316,7 +1311,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1365,9 +1360,9 @@
 
 [[package]]
 name = "similar"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
 
 [[package]]
 name = "smallvec"
@@ -1394,6 +1389,12 @@
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
+[[package]]
 name = "structdump"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1456,9 +1457,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1467,15 +1468,14 @@
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1517,22 +1517,22 @@
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
 
 [[package]]
@@ -1652,27 +1652,9 @@
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
@@ -1682,21 +1664,6 @@
 
 [[package]]
 name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
@@ -1727,12 +1694,6 @@
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
@@ -1742,12 +1703,6 @@
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1760,12 +1715,6 @@
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1778,12 +1727,6 @@
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1799,12 +1742,6 @@
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
@@ -1814,12 +1751,6 @@
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1835,12 +1766,6 @@
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
@@ -1871,7 +1796,7 @@
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "indexmap 2.1.0",
+ "indexmap 2.2.3",
  "itertools",
  "proc-macro2",
  "quote",
@@ -1899,20 +1824,20 @@
 
 [[package]]
 name = "zerocopy"
-version = "0.7.30"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.30"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.50",
 ]
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,24 +18,24 @@
 jrsonnet-gcmodule = "0.3.6"
 ass-stroke = { git = "https://github.com/CertainLach/ass-stroke", version = "0.1.0" }
 
-serde = "1.0.190"
-serde_json = "1.0.107"
+serde = "1.0.197"
+serde_json = "1.0.114"
 serde_yaml_with_quirks = "0.8.24"
 
-anyhow = "1.0.48"
+anyhow = "1.0.80"
 thiserror = "1.0"
 mimallocator = "0.1.3"
 indoc = "2.0"
-dprint-core = "0.63.2"
-insta = "1.15"
-tempfile = "3.8"
+dprint-core = "0.63.3"
+insta = "1.35"
+tempfile = "3.10"
 pathdiff = "0.2.1"
-hashbrown = "0.14.2"
+hashbrown = "0.14.3"
 static_assertions = "1.1"
 rustc-hash = "1.1"
 bincode = "1.3"
-annotate-snippets = "0.9.1"
-num-bigint = "0.4.3"
+annotate-snippets = "0.9.2"
+num-bigint = "0.4.4"
 derivative = "2.2.0"
 strsim = "0.10.0"
 structdump = "0.2.0"
@@ -44,28 +44,28 @@
 syn = "2.0"
 peg = "0.8.2"
 drop_bomb = "0.1.5"
-logos = "0.12.0"
-miette = "5.5.0"
+logos = "0.12.1"
+miette = "5.10.0"
 rowan = "0.15"
 text-size = "1.1"
 md5 = "0.7.0"
-sha1 = "0.10.5"
-sha2 = "0.10.6"
+sha1 = "0.10.6"
+sha2 = "0.10.8"
 sha3 = "0.10.8"
-base64 = "0.21.0"
-indexmap = "2.0.2"
+base64 = "0.21.7"
+indexmap = "2.2.3"
 itertools = "0.11.0"
 ungrammar = "1.16.1"
-xshell = "0.2.2"
+xshell = "0.2.5"
 
-clap = "4.4"
-clap_complete = "4.4"
+clap = "4.5"
+clap_complete = "4.5"
 
-lsp-server = "0.7.4"
+lsp-server = "0.7.6"
 lsp-types = "0.94.1"
 
-regex = "1.8.4"
-lru = "0.10.0"
+regex = "1.10.3"
+lru = "0.10.1"
 
 #[profile.test]
 #opt-level = 1
modifiedcmds/jrsonnet-fmt/src/children.rsdiffbeforeafterboth
--- a/cmds/jrsonnet-fmt/src/children.rs
+++ b/cmds/jrsonnet-fmt/src/children.rs
@@ -60,41 +60,6 @@
 	out
 }
 
-pub fn trivia_between(
-	node: SyntaxNode,
-	start: Option<&SyntaxElement>,
-	end: Option<&SyntaxElement>,
-) -> EndingComments {
-	let mut iter = node.children_with_tokens().peekable();
-	while iter.peek() != start {
-		iter.next();
-	}
-	iter.next();
-
-	let loose = start.is_none() || end.is_none();
-
-	let mut out = Vec::new();
-	for item in iter.take_while(|i| Some(i) != end) {
-		if let Some(trivia) = item.as_token().cloned().and_then(Trivia::cast) {
-			out.push(Ok(trivia));
-		} else if CustomError::can_cast(item.kind()) {
-			out.push(Err(item.to_string()))
-		} else if loose {
-			break;
-		} else {
-			assert!(
-				TS![, ;].contains(item.kind()),
-				"silently eaten token: {:?}",
-				item.kind()
-			)
-		}
-	}
-	EndingComments {
-		should_start_with_newline: should_start_with_newline(None, &out),
-		trivia: out,
-	}
-}
-
 pub fn children_between<T: AstNode + Debug>(
 	node: SyntaxNode,
 	start: Option<&SyntaxElement>,
modifiedcmds/jrsonnet-fmt/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet-fmt/src/main.rs
+++ b/cmds/jrsonnet-fmt/src/main.rs
@@ -20,7 +20,7 @@
 };
 
 use crate::{
-	children::{trivia_after, trivia_between},
+	children::trivia_after,
 	comments::{format_comments, CommentLocation},
 };
modifiedcmds/jrsonnet-lsp/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet-lsp/src/main.rs
+++ b/cmds/jrsonnet-lsp/src/main.rs
@@ -13,7 +13,7 @@
 	let mut log = File::create("test").unwrap();
 	writeln!(log, "start").unwrap();
 	let (connection, io_threads) = Connection::stdio();
-	let capabilities = serde_json::to_value(&ServerCapabilities {
+	let capabilities = serde_json::to_value(ServerCapabilities {
 		completion_provider: Some(CompletionOptions::default()),
 		definition_provider: Some(lsp_types::OneOf::Left(true)),
 		document_link_provider: Some(DocumentLinkOptions {
modifiedcrates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rsdiffbeforeafterboth
--- a/crates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rs
+++ b/crates/jrsonnet-rowan-parser/src/generated/syntax_kinds.rs
@@ -290,4 +290,5 @@
 }
 #[macro_export]
 macro_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 } }
+#[allow(unused_imports)]
 pub use T;
modifiedxtask/src/sourcegen/ast.rsdiffbeforeafterboth
before · xtask/src/sourcegen/ast.rs
1use std::collections::{BTreeSet, HashMap};23use proc_macro2::TokenStream;4use quote::format_ident;5use ungrammar::{Grammar, Rule};67use super::{8	util::{pluralize, to_lower_snake_case},9	KindsSrc,10};1112impl AstNodeSrc {13	pub fn remove_field(&mut self, to_remove: Vec<usize>) {14		to_remove.into_iter().rev().for_each(|idx| {15			self.fields.remove(idx);16		});17	}18}1920#[allow(dead_code)]21#[derive(Default, Debug)]22pub struct AstSrc {23	pub nodes: Vec<AstNodeSrc>,24	pub enums: Vec<AstEnumSrc>,25	pub token_enums: Vec<AstTokenEnumSrc>,26}27#[derive(Debug)]28pub struct AstNodeSrc {29	pub doc: Vec<String>,30	pub name: String,31	pub traits: Vec<String>,32	pub fields: Vec<Field>,33}3435#[derive(Debug, Eq, PartialEq)]36pub enum Field {37	Token(String),38	Node {39		name: String,40		ty: String,41		cardinality: Cardinality,42	},43}4445#[derive(Debug, Eq, PartialEq)]46pub enum Cardinality {47	/// This field may not exist in code48	Optional,49	/// This field should exist in correctly parsed code50	Required,51	/// There may be multiple field values of this kind52	Many,53}5455#[derive(Debug, Clone)]56pub struct AstEnumSrc {57	pub doc: Vec<String>,58	pub name: String,59	pub traits: Vec<String>,60	pub variants: Vec<String>,61}6263#[derive(Debug, Clone)]64pub struct AstTokenEnumSrc {65	pub doc: Vec<String>,66	pub name: String,67	pub variants: Vec<String>,68}6970impl Field {71	pub fn is_many(&self) -> bool {72		matches!(73			self,74			Field::Node {75				cardinality: Cardinality::Many,76				..77			}78		)79	}8081	pub fn token_name(&self) -> Option<String> {82		match self {83			Field::Token(token) => Some(token.clone()),84			_ => None,85		}86	}87	pub fn token_kind(&self, kinds: &KindsSrc) -> Option<TokenStream> {88		match self {89			Field::Token(token) => Some(kinds.token(token).expect("token exists").reference()),90			_ => None,91		}92	}93	pub fn is_token_enum(&self, grammar: &AstSrc) -> bool {94		match self {95			Field::Node { ty, .. } => grammar.token_enums.iter().any(|e| &e.name == ty),96			_ => false,97		}98	}99100	pub fn method_name(&self, kinds: &KindsSrc) -> proc_macro2::Ident {101		match self {102			Field::Token(name) => kinds.token(name).expect("token exists").method_name(),103			Field::Node { name, .. } => {104				format_ident!("{}", name)105			}106		}107	}108	pub fn ty(&self) -> proc_macro2::Ident {109		match self {110			Field::Token(_) => format_ident!("SyntaxToken"),111			Field::Node { ty, .. } => format_ident!("{}", ty),112		}113	}114}115116pub fn lower(kinds: &KindsSrc, grammar: &Grammar) -> AstSrc {117	let mut res = AstSrc {118		// tokens,119		..Default::default()120	};121122	let nodes = grammar.iter().collect::<Vec<_>>();123124	for &node in &nodes {125		let name = grammar[node].name.clone();126		let rule = &grammar[node].rule;127		match lower_enum(grammar, rule) {128			Some(variants) => {129				let enum_src = AstEnumSrc {130					doc: Vec::new(),131					name,132					traits: Vec::new(),133					variants,134				};135				res.enums.push(enum_src);136			}137			None => match lower_token_enum(grammar, rule) {138				Some(variants) => {139					let tokens_enum_src = AstTokenEnumSrc {140						doc: Vec::new(),141						name,142						variants,143					};144					res.token_enums.push(tokens_enum_src);145				}146				None => {147					let mut fields = Vec::new();148					lower_rule(&mut fields, grammar, None, rule, false);149					let mut types = HashMap::new();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)) {152							// panic!("{name}.{} has same type as {name}.{}, resolve conflict by wrapping one field: {}", old, field.method_name(kinds), field.ty());153						}154						// TODO: check for assignable field types, i.e you can have155						// ```156						// SomeEnum =157						//     SomeItem158						// |   SomeOtherItem159						// ```160						// And check above will fail to detect conflict in161						// ```162						// SomeStruct =163						//     SomeEnum164						//     SomeItem165						// ```166						// Despite generating getters, which will both return SomeEnum167					}168					res.nodes.push(AstNodeSrc {169						doc: Vec::new(),170						name,171						traits: Vec::new(),172						fields,173					});174				}175			},176		}177	}178179	deduplicate_fields(&mut res);180	extract_struct_traits(kinds, &mut res);181	extract_enum_traits(&mut res);182	res183}184185fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {186	let alternatives = match rule {187		Rule::Alt(it) => it,188		_ => return None,189	};190	let mut variants = Vec::new();191	for alternative in alternatives {192		match alternative {193			Rule::Node(it) => variants.push(grammar[*it].name.clone()),194			Rule::Token(it) if grammar[*it].name == ";" => (),195			_ => return None,196		}197	}198	Some(variants)199}200fn lower_token_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {201	let alternatives = match rule {202		Rule::Alt(it) => it,203		_ => return None,204	};205	let mut variants = Vec::new();206	for alternative in alternatives {207		match alternative {208			Rule::Token(it) => variants.push(grammar[*it].name.clone()),209			_ => return None,210		}211	}212	Some(variants)213}214215fn lower_rule(216	acc: &mut Vec<Field>,217	grammar: &Grammar,218	label: Option<&String>,219	rule: &Rule,220	in_optional: bool,221) {222	if lower_comma_list(acc, grammar, label, rule) {223		return;224	}225226	match rule {227		Rule::Node(node) => {228			let ty = grammar[*node].name.clone();229			let name = label.cloned().unwrap_or_else(|| to_lower_snake_case(&ty));230			let field = Field::Node {231				name,232				ty,233				cardinality: if in_optional {234					Cardinality::Optional235				} else {236					Cardinality::Required237				},238			};239			acc.push(field);240		}241		Rule::Token(token) => {242			assert!(label.is_none(), "uexpected label: {:?}", label);243			let name = grammar[*token].name.clone();244			let field = Field::Token(name);245			acc.push(field);246		}247		Rule::Rep(inner) => {248			if let Rule::Node(node) = &**inner {249				let ty = grammar[*node].name.clone();250				let name = label251					.cloned()252					.unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));253				let field = Field::Node {254					name,255					ty,256					cardinality: Cardinality::Many,257				};258				acc.push(field);259				return;260			}261			todo!("unsupported repitition: {:?}", rule)262		}263		Rule::Labeled { label: l, rule } => {264			assert!(label.is_none());265			lower_rule(acc, grammar, Some(l), rule, in_optional);266		}267		Rule::Seq(rules) | Rule::Alt(rules) => {268			for rule in rules {269				lower_rule(acc, grammar, label, rule, in_optional)270			}271		}272		Rule::Opt(rule) => lower_rule(acc, grammar, label, rule, true),273	}274}275276// (T (',' T)* ','?)277fn lower_comma_list(278	acc: &mut Vec<Field>,279	grammar: &Grammar,280	label: Option<&String>,281	rule: &Rule,282) -> bool {283	let rule = match rule {284		Rule::Seq(it) => it,285		_ => return false,286	};287	let (node, repeat, trailing_comma) = match rule.as_slice() {288		[Rule::Node(node), Rule::Rep(repeat), Rule::Opt(trailing_comma)] => {289			(node, repeat, trailing_comma)290		}291		_ => return false,292	};293	let repeat = match &**repeat {294		Rule::Seq(it) => it,295		_ => return false,296	};297	match repeat.as_slice() {298		[comma, Rule::Node(n)] if comma == &**trailing_comma && n == node => (),299		_ => return false,300	}301	let ty = grammar[*node].name.clone();302	let name = label303		.cloned()304		.unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));305	let field = Field::Node {306		name,307		ty,308		cardinality: Cardinality::Many,309	};310	acc.push(field);311	true312}313314fn deduplicate_fields(ast: &mut AstSrc) {315	for node in &mut ast.nodes {316		let mut i = 0;317		'outer: while i < node.fields.len() {318			for j in 0..i {319				let f1 = &node.fields[i];320				let f2 = &node.fields[j];321				if f1 == f2 {322					node.fields.remove(i);323					continue 'outer;324				}325			}326			i += 1;327		}328	}329}330331fn extract_struct_traits(kinds: &KindsSrc, ast: &mut AstSrc) {332	// TODO: add common accessor traits here.333	let traits: &[(&str, &[&str])] = &[];334335	for node in &mut ast.nodes {336		for (name, methods) in traits {337			extract_struct_trait(kinds, node, name, methods);338		}339	}340}341342fn extract_struct_trait(343	kinds: &KindsSrc,344	node: &mut AstNodeSrc,345	trait_name: &str,346	methods: &[&str],347) {348	let mut to_remove = Vec::new();349	for (i, field) in node.fields.iter().enumerate() {350		let method_name = field.method_name(kinds).to_string();351		if methods.iter().any(|&it| it == method_name) {352			to_remove.push(i);353		}354	}355	if to_remove.len() == methods.len() {356		node.traits.push(trait_name.to_string());357		node.remove_field(to_remove);358	}359}360361fn extract_enum_traits(ast: &mut AstSrc) {362	let enums = ast.enums.clone();363	for enm in &mut ast.enums {364		let nodes = &ast.nodes;365366		let mut variant_traits = enm.variants.iter().map(|var| {367			nodes368				.iter()369				.find_map(|node| {370					if &node.name != var {371						return None;372					}373					Some(node.traits.iter().cloned().collect::<BTreeSet<_>>())374				})375				.unwrap_or_else(|| {376					enums377						.iter()378						.find_map(|node| {379							if &node.name != var {380								return None;381							}382							Some(node.traits.iter().cloned().collect::<BTreeSet<_>>())383						})384						.unwrap_or_else(|| {385							panic!("could not find struct {var} for enum {}::{var}", enm.name)386						})387				})388		});389390		let mut enum_traits = match variant_traits.next() {391			Some(it) => it,392			None => continue,393		};394		for traits in variant_traits {395			enum_traits = enum_traits.intersection(&traits).cloned().collect();396		}397		enm.traits = enum_traits.into_iter().collect();398	}399}
after · xtask/src/sourcegen/ast.rs
1use std::collections::{BTreeSet, HashMap};23use proc_macro2::TokenStream;4use quote::format_ident;5use ungrammar::{Grammar, Rule};67use super::{8	util::{pluralize, to_lower_snake_case},9	KindsSrc,10};1112impl AstNodeSrc {13	pub fn remove_field(&mut self, to_remove: Vec<usize>) {14		to_remove.into_iter().rev().for_each(|idx| {15			self.fields.remove(idx);16		});17	}18}1920#[allow(dead_code)]21#[derive(Default, Debug)]22pub struct AstSrc {23	pub nodes: Vec<AstNodeSrc>,24	pub enums: Vec<AstEnumSrc>,25	pub token_enums: Vec<AstTokenEnumSrc>,26}27#[derive(Debug)]28pub struct AstNodeSrc {29	pub doc: Vec<String>,30	pub name: String,31	pub traits: Vec<String>,32	pub fields: Vec<Field>,33}3435#[derive(Debug, Eq, PartialEq)]36pub enum Field {37	Token(String),38	Node {39		name: String,40		ty: String,41		cardinality: Cardinality,42	},43}4445#[derive(Debug, Eq, PartialEq)]46pub enum Cardinality {47	/// This field may not exist in code48	Optional,49	/// This field should exist in correctly parsed code50	Required,51	/// There may be multiple field values of this kind52	Many,53}5455#[derive(Debug, Clone)]56pub struct AstEnumSrc {57	pub doc: Vec<String>,58	pub name: String,59	pub traits: Vec<String>,60	pub variants: Vec<String>,61}6263#[derive(Debug, Clone)]64pub struct AstTokenEnumSrc {65	pub doc: Vec<String>,66	pub name: String,67	pub variants: Vec<String>,68}6970impl Field {71	pub fn is_many(&self) -> bool {72		matches!(73			self,74			Field::Node {75				cardinality: Cardinality::Many,76				..77			}78		)79	}8081	pub fn token_name(&self) -> Option<String> {82		match self {83			Field::Token(token) => Some(token.clone()),84			_ => None,85		}86	}87	pub fn token_kind(&self, kinds: &KindsSrc) -> Option<TokenStream> {88		match self {89			Field::Token(token) => Some(kinds.token(token).expect("token exists").reference()),90			_ => None,91		}92	}93	pub fn is_token_enum(&self, grammar: &AstSrc) -> bool {94		match self {95			Field::Node { ty, .. } => grammar.token_enums.iter().any(|e| &e.name == ty),96			_ => false,97		}98	}99100	pub fn method_name(&self, kinds: &KindsSrc) -> proc_macro2::Ident {101		match self {102			Field::Token(name) => kinds.token(name).expect("token exists").method_name(),103			Field::Node { name, .. } => {104				format_ident!("{}", name)105			}106		}107	}108	pub fn ty(&self) -> proc_macro2::Ident {109		match self {110			Field::Token(_) => format_ident!("SyntaxToken"),111			Field::Node { ty, .. } => format_ident!("{}", ty),112		}113	}114}115116pub fn lower(kinds: &KindsSrc, grammar: &Grammar) -> AstSrc {117	let mut res = AstSrc {118		// tokens,119		..Default::default()120	};121122	let nodes = grammar.iter().collect::<Vec<_>>();123124	for &node in &nodes {125		let name = grammar[node].name.clone();126		let rule = &grammar[node].rule;127		match lower_enum(grammar, rule) {128			Some(variants) => {129				let enum_src = AstEnumSrc {130					doc: Vec::new(),131					name,132					traits: Vec::new(),133					variants,134				};135				res.enums.push(enum_src);136			}137			None => match lower_token_enum(grammar, rule) {138				Some(variants) => {139					let tokens_enum_src = AstTokenEnumSrc {140						doc: Vec::new(),141						name,142						variants,143					};144					res.token_enums.push(tokens_enum_src);145				}146				None => {147					let mut fields = Vec::new();148					lower_rule(&mut fields, grammar, None, rule, false);149					let mut types = HashMap::new();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)) {152							// panic!("{name}.{} has same type as {name}.{}, resolve conflict by wrapping one field: {}", old, field.method_name(kinds), field.ty());153						}154						// TODO: check for assignable field types, i.e you can have155						// ```156						// SomeEnum =157						//     SomeItem158						// |   SomeOtherItem159						// ```160						// And check above will fail to detect conflict in161						// ```162						// SomeStruct =163						//     SomeEnum164						//     SomeItem165						// ```166						// Despite generating getters, which will both return SomeEnum167					}168					res.nodes.push(AstNodeSrc {169						doc: Vec::new(),170						name,171						traits: Vec::new(),172						fields,173					});174				}175			},176		}177	}178179	deduplicate_fields(&mut res);180	extract_struct_traits(kinds, &mut res);181	extract_enum_traits(&mut res);182	res183}184185fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {186	let alternatives = match rule {187		Rule::Alt(it) => it,188		_ => return None,189	};190	let mut variants = Vec::new();191	for alternative in alternatives {192		match alternative {193			Rule::Node(it) => variants.push(grammar[*it].name.clone()),194			Rule::Token(it) if grammar[*it].name == ";" => (),195			_ => return None,196		}197	}198	Some(variants)199}200fn lower_token_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {201	let alternatives = match rule {202		Rule::Alt(it) => it,203		_ => return None,204	};205	let mut variants = Vec::new();206	for alternative in alternatives {207		match alternative {208			Rule::Token(it) => variants.push(grammar[*it].name.clone()),209			_ => return None,210		}211	}212	Some(variants)213}214215fn lower_rule(216	acc: &mut Vec<Field>,217	grammar: &Grammar,218	label: Option<&String>,219	rule: &Rule,220	in_optional: bool,221) {222	if lower_comma_list(acc, grammar, label, rule) {223		return;224	}225226	match rule {227		Rule::Node(node) => {228			let ty = grammar[*node].name.clone();229			let name = label.cloned().unwrap_or_else(|| to_lower_snake_case(&ty));230			let field = Field::Node {231				name,232				ty,233				cardinality: if in_optional {234					Cardinality::Optional235				} else {236					Cardinality::Required237				},238			};239			acc.push(field);240		}241		Rule::Token(token) => {242			assert!(label.is_none(), "uexpected label: {:?}", label);243			let name = grammar[*token].name.clone();244			let field = Field::Token(name);245			acc.push(field);246		}247		Rule::Rep(inner) => {248			if let Rule::Node(node) = &**inner {249				let ty = grammar[*node].name.clone();250				let name = label251					.cloned()252					.unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));253				let field = Field::Node {254					name,255					ty,256					cardinality: Cardinality::Many,257				};258				acc.push(field);259				return;260			}261			todo!("unsupported repitition: {:?}", rule)262		}263		Rule::Labeled { label: l, rule } => {264			assert!(label.is_none());265			lower_rule(acc, grammar, Some(l), rule, in_optional);266		}267		Rule::Seq(rules) | Rule::Alt(rules) => {268			for rule in rules {269				lower_rule(acc, grammar, label, rule, in_optional)270			}271		}272		Rule::Opt(rule) => lower_rule(acc, grammar, label, rule, true),273	}274}275276// (T (',' T)* ','?)277fn lower_comma_list(278	acc: &mut Vec<Field>,279	grammar: &Grammar,280	label: Option<&String>,281	rule: &Rule,282) -> bool {283	let rule = match rule {284		Rule::Seq(it) => it,285		_ => return false,286	};287	let (node, repeat, trailing_comma) = match rule.as_slice() {288		[Rule::Node(node), Rule::Rep(repeat), Rule::Opt(trailing_comma)] => {289			(node, repeat, trailing_comma)290		}291		_ => return false,292	};293	let repeat = match &**repeat {294		Rule::Seq(it) => it,295		_ => return false,296	};297	match repeat.as_slice() {298		[comma, Rule::Node(n)] if comma == &**trailing_comma && n == node => (),299		_ => return false,300	}301	let ty = grammar[*node].name.clone();302	let name = label303		.cloned()304		.unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));305	let field = Field::Node {306		name,307		ty,308		cardinality: Cardinality::Many,309	};310	acc.push(field);311	true312}313314fn deduplicate_fields(ast: &mut AstSrc) {315	for node in &mut ast.nodes {316		let mut i = 0;317		'outer: while i < node.fields.len() {318			for j in 0..i {319				let f1 = &node.fields[i];320				let f2 = &node.fields[j];321				if f1 == f2 {322					node.fields.remove(i);323					continue 'outer;324				}325			}326			i += 1;327		}328	}329}330331fn extract_struct_traits(kinds: &KindsSrc, ast: &mut AstSrc) {332	// TODO: add common accessor traits here.333	let traits: &[(&str, &[&str])] = &[];334335	for node in &mut ast.nodes {336		for (name, methods) in traits {337			extract_struct_trait(kinds, node, name, methods);338		}339	}340}341342fn extract_struct_trait(343	kinds: &KindsSrc,344	node: &mut AstNodeSrc,345	trait_name: &str,346	methods: &[&str],347) {348	let mut to_remove = Vec::new();349	for (i, field) in node.fields.iter().enumerate() {350		let method_name = field.method_name(kinds).to_string();351		if methods.iter().any(|&it| it == method_name) {352			to_remove.push(i);353		}354	}355	if to_remove.len() == methods.len() {356		node.traits.push(trait_name.to_string());357		node.remove_field(to_remove);358	}359}360361fn extract_enum_traits(ast: &mut AstSrc) {362	let enums = ast.enums.clone();363	for enm in &mut ast.enums {364		let nodes = &ast.nodes;365366		let mut variant_traits = enm.variants.iter().map(|var| {367			nodes368				.iter()369				.find_map(|node| {370					if &node.name != var {371						return None;372					}373					Some(node.traits.iter().cloned().collect::<BTreeSet<_>>())374				})375				.unwrap_or_else(|| {376					enums377						.iter()378						.find_map(|node| {379							if &node.name != var {380								return None;381							}382							Some(node.traits.iter().cloned().collect::<BTreeSet<_>>())383						})384						.unwrap_or_else(|| {385							panic!("could not find struct {var} for enum {}::{var}", enm.name)386						})387				})388		});389390		let mut enum_traits = match variant_traits.next() {391			Some(it) => it,392			None => continue,393		};394		for traits in variant_traits {395			enum_traits = enum_traits.intersection(&traits).cloned().collect();396		}397		enm.traits = enum_traits.into_iter().collect();398	}399}
modifiedxtask/src/sourcegen/mod.rsdiffbeforeafterboth
--- a/xtask/src/sourcegen/mod.rs
+++ b/xtask/src/sourcegen/mod.rs
@@ -183,6 +183,7 @@
 
 		#[macro_export]
 		macro_rules! T {#(#t_macros);*}
+		#[allow(unused_imports)]
 		pub use T;
 	};