Skip to content

Commit 6ccb768

Browse files
valadaptiveemilk
andauthored
Bump accesskit to 0.19 (emilk#7040)
Parley's bumped accesskit to 0.19, so we have to as well. It's a bit concerning that we may end up locked to the version of accesskit that Parley uses, but oh well. [This kittest PR will have to be merged first.](rerun-io/kittest#11) --------- Co-authored-by: Emil Ernerfeldt <[email protected]>
1 parent a15040c commit 6ccb768

File tree

3 files changed

+129
-54
lines changed

3 files changed

+129
-54
lines changed

Cargo.lock

Lines changed: 125 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,19 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
2020

2121
[[package]]
2222
name = "accesskit"
23-
version = "0.18.0"
23+
version = "0.19.0"
2424
source = "registry+https://github.com/rust-lang/crates.io-index"
25-
checksum = "becf0eb5215b6ecb0a739c31c21bd83c4f326524c9b46b7e882d77559b60a529"
25+
checksum = "e25ae84c0260bdf5df07796d7cc4882460de26a2b406ec0e6c42461a723b271b"
2626
dependencies = [
2727
"enumn",
2828
"serde",
2929
]
3030

31-
[[package]]
32-
name = "accesskit_android"
33-
version = "0.1.0"
34-
source = "registry+https://github.com/rust-lang/crates.io-index"
35-
checksum = "d42f298f1db7c022cc69f20f06085b34b08ffae79b37488b7aae20b210777d17"
36-
dependencies = [
37-
"accesskit",
38-
"accesskit_consumer",
39-
"jni",
40-
"log",
41-
"once_cell",
42-
"paste",
43-
]
44-
4531
[[package]]
4632
name = "accesskit_atspi_common"
47-
version = "0.11.0"
33+
version = "0.12.0"
4834
source = "registry+https://github.com/rust-lang/crates.io-index"
49-
checksum = "ce9928251cd5651ae983a77aeaa528471eed47cf705885e0b03249b72fe4e8e1"
35+
checksum = "29bd41de2e54451a8ca0dd95ebf45b54d349d29ebceb7f20be264eee14e3d477"
5036
dependencies = [
5137
"accesskit",
5238
"accesskit_consumer",
@@ -58,20 +44,19 @@ dependencies = [
5844

5945
[[package]]
6046
name = "accesskit_consumer"
61-
version = "0.27.0"
47+
version = "0.28.0"
6248
source = "registry+https://github.com/rust-lang/crates.io-index"
63-
checksum = "d0bf66a7bf0b7ea4fd7742d50b64782a88f99217cf246b3f93b4162528dde520"
49+
checksum = "8bfae7c152994a31dc7d99b8eeac7784a919f71d1b306f4b83217e110fd3824c"
6450
dependencies = [
6551
"accesskit",
6652
"hashbrown",
67-
"immutable-chunkmap",
6853
]
6954

7055
[[package]]
7156
name = "accesskit_macos"
72-
version = "0.19.0"
57+
version = "0.20.0"
7358
source = "registry+https://github.com/rust-lang/crates.io-index"
74-
checksum = "09e230718177753b4e4ad9e1d9f6cfc2f4921212d4c1c480b253f526babb258d"
59+
checksum = "692dd318ff8a7a0ffda67271c4bd10cf32249656f4e49390db0b26ca92b095f2"
7560
dependencies = [
7661
"accesskit",
7762
"accesskit_consumer",
@@ -83,9 +68,9 @@ dependencies = [
8368

8469
[[package]]
8570
name = "accesskit_unix"
86-
version = "0.14.0"
71+
version = "0.15.0"
8772
source = "registry+https://github.com/rust-lang/crates.io-index"
88-
checksum = "2ef06642e9f02f1708ad55e1eaeb8ad6956c22917699c4f313afa4f8f1b5e664"
73+
checksum = "c5f7474c36606d0fe4f438291d667bae7042ea2760f506650ad2366926358fc8"
8974
dependencies = [
9075
"accesskit",
9176
"accesskit_atspi_common",
@@ -101,27 +86,25 @@ dependencies = [
10186

10287
[[package]]
10388
name = "accesskit_windows"
104-
version = "0.25.0"
89+
version = "0.27.0"
10590
source = "registry+https://github.com/rust-lang/crates.io-index"
106-
checksum = "65178f3df98a51e4238e584fcb255cb1a4f9111820848eeddd37663be40a625f"
91+
checksum = "70a042b62c9c05bf7b616f015515c17d2813f3ba89978d6f4fc369735d60700a"
10792
dependencies = [
10893
"accesskit",
10994
"accesskit_consumer",
11095
"hashbrown",
111-
"paste",
11296
"static_assertions",
113-
"windows",
114-
"windows-core 0.58.0",
97+
"windows 0.61.1",
98+
"windows-core 0.61.0",
11599
]
116100

117101
[[package]]
118102
name = "accesskit_winit"
119-
version = "0.24.0"
103+
version = "0.27.0"
120104
source = "registry+https://github.com/rust-lang/crates.io-index"
121-
checksum = "2c28531b0a1612b46d057a724a1e3de42a4bb101ff9f18c96c32f605b6e5ef06"
105+
checksum = "5c1f0d3d13113d8857542a4f8d1a1c24d1dc1527b77aee8426127f4901588708"
122106
dependencies = [
123107
"accesskit",
124-
"accesskit_android",
125108
"accesskit_macos",
126109
"accesskit_unix",
127110
"accesskit_windows",
@@ -2000,7 +1983,7 @@ dependencies = [
20001983
"log",
20011984
"presser",
20021985
"thiserror 1.0.66",
2003-
"windows",
1986+
"windows 0.58.0",
20041987
]
20051988

20061989
[[package]]
@@ -2326,15 +2309,6 @@ version = "0.13.0"
23262309
source = "registry+https://github.com/rust-lang/crates.io-index"
23272310
checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
23282311

2329-
[[package]]
2330-
name = "immutable-chunkmap"
2331-
version = "2.0.6"
2332-
source = "registry+https://github.com/rust-lang/crates.io-index"
2333-
checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
2334-
dependencies = [
2335-
"arrayvec",
2336-
]
2337-
23382312
[[package]]
23392313
name = "indexmap"
23402314
version = "2.8.0"
@@ -2446,7 +2420,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
24462420
[[package]]
24472421
name = "kittest"
24482422
version = "0.1.0"
2449-
source = "git+https://github.com/rerun-io/kittest?branch=main#5803de399c0061d4cd5479929277066faa034331"
2423+
source = "git+https://github.com/rerun-io/kittest?branch=main#679f9ade828021295c5f86f38275d9271d001004"
24502424
dependencies = [
24512425
"accesskit",
24522426
"accesskit_consumer",
@@ -4895,7 +4869,7 @@ dependencies = [
48954869
"wasm-bindgen",
48964870
"web-sys",
48974871
"wgpu-types",
4898-
"windows",
4872+
"windows 0.58.0",
48994873
"windows-core 0.58.0",
49004874
]
49014875

@@ -4954,6 +4928,28 @@ dependencies = [
49544928
"windows-targets 0.52.6",
49554929
]
49564930

4931+
[[package]]
4932+
name = "windows"
4933+
version = "0.61.1"
4934+
source = "registry+https://github.com/rust-lang/crates.io-index"
4935+
checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
4936+
dependencies = [
4937+
"windows-collections",
4938+
"windows-core 0.61.0",
4939+
"windows-future",
4940+
"windows-link",
4941+
"windows-numerics",
4942+
]
4943+
4944+
[[package]]
4945+
name = "windows-collections"
4946+
version = "0.2.0"
4947+
source = "registry+https://github.com/rust-lang/crates.io-index"
4948+
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
4949+
dependencies = [
4950+
"windows-core 0.61.0",
4951+
]
4952+
49574953
[[package]]
49584954
name = "windows-core"
49594955
version = "0.52.0"
@@ -4969,13 +4965,36 @@ version = "0.58.0"
49694965
source = "registry+https://github.com/rust-lang/crates.io-index"
49704966
checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
49714967
dependencies = [
4972-
"windows-implement",
4973-
"windows-interface",
4974-
"windows-result",
4975-
"windows-strings",
4968+
"windows-implement 0.58.0",
4969+
"windows-interface 0.58.0",
4970+
"windows-result 0.2.0",
4971+
"windows-strings 0.1.0",
49764972
"windows-targets 0.52.6",
49774973
]
49784974

4975+
[[package]]
4976+
name = "windows-core"
4977+
version = "0.61.0"
4978+
source = "registry+https://github.com/rust-lang/crates.io-index"
4979+
checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
4980+
dependencies = [
4981+
"windows-implement 0.60.0",
4982+
"windows-interface 0.59.1",
4983+
"windows-link",
4984+
"windows-result 0.3.2",
4985+
"windows-strings 0.4.0",
4986+
]
4987+
4988+
[[package]]
4989+
name = "windows-future"
4990+
version = "0.2.0"
4991+
source = "registry+https://github.com/rust-lang/crates.io-index"
4992+
checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
4993+
dependencies = [
4994+
"windows-core 0.61.0",
4995+
"windows-link",
4996+
]
4997+
49794998
[[package]]
49804999
name = "windows-implement"
49815000
version = "0.58.0"
@@ -4987,6 +5006,17 @@ dependencies = [
49875006
"syn",
49885007
]
49895008

5009+
[[package]]
5010+
name = "windows-implement"
5011+
version = "0.60.0"
5012+
source = "registry+https://github.com/rust-lang/crates.io-index"
5013+
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
5014+
dependencies = [
5015+
"proc-macro2",
5016+
"quote",
5017+
"syn",
5018+
]
5019+
49905020
[[package]]
49915021
name = "windows-interface"
49925022
version = "0.58.0"
@@ -4998,6 +5028,33 @@ dependencies = [
49985028
"syn",
49995029
]
50005030

5031+
[[package]]
5032+
name = "windows-interface"
5033+
version = "0.59.1"
5034+
source = "registry+https://github.com/rust-lang/crates.io-index"
5035+
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
5036+
dependencies = [
5037+
"proc-macro2",
5038+
"quote",
5039+
"syn",
5040+
]
5041+
5042+
[[package]]
5043+
name = "windows-link"
5044+
version = "0.1.1"
5045+
source = "registry+https://github.com/rust-lang/crates.io-index"
5046+
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
5047+
5048+
[[package]]
5049+
name = "windows-numerics"
5050+
version = "0.2.0"
5051+
source = "registry+https://github.com/rust-lang/crates.io-index"
5052+
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
5053+
dependencies = [
5054+
"windows-core 0.61.0",
5055+
"windows-link",
5056+
]
5057+
50015058
[[package]]
50025059
name = "windows-result"
50035060
version = "0.2.0"
@@ -5007,16 +5064,34 @@ dependencies = [
50075064
"windows-targets 0.52.6",
50085065
]
50095066

5067+
[[package]]
5068+
name = "windows-result"
5069+
version = "0.3.2"
5070+
source = "registry+https://github.com/rust-lang/crates.io-index"
5071+
checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
5072+
dependencies = [
5073+
"windows-link",
5074+
]
5075+
50105076
[[package]]
50115077
name = "windows-strings"
50125078
version = "0.1.0"
50135079
source = "registry+https://github.com/rust-lang/crates.io-index"
50145080
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
50155081
dependencies = [
5016-
"windows-result",
5082+
"windows-result 0.2.0",
50175083
"windows-targets 0.52.6",
50185084
]
50195085

5086+
[[package]]
5087+
name = "windows-strings"
5088+
version = "0.4.0"
5089+
source = "registry+https://github.com/rust-lang/crates.io-index"
5090+
checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
5091+
dependencies = [
5092+
"windows-link",
5093+
]
5094+
50205095
[[package]]
50215096
name = "windows-sys"
50225097
version = "0.45.0"

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ egui_glow = { version = "0.31.1", path = "crates/egui_glow", default-features =
6868
egui_kittest = { version = "0.31.1", path = "crates/egui_kittest", default-features = false }
6969
eframe = { version = "0.31.1", path = "crates/eframe", default-features = false }
7070

71-
accesskit = "0.18.0"
72-
accesskit_winit = "0.24"
71+
accesskit = "0.19.0"
72+
accesskit_winit = "0.27"
7373
ahash = { version = "0.8.11", default-features = false, features = [
7474
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
7575
"std",

deny.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ skip = [
5353
{ name = "redox_syscall" }, # old version via winit
5454
{ name = "thiserror" }, # ecosystem is in the process of migrating from 1.x to 2.x
5555
{ name = "thiserror-impl" }, # same as above
56-
{ name = "windows-core" }, # Chrono pulls in 0.51, accesskit uses 0.58.0
57-
{ name = "windows-sys" }, # glutin pulls in 0.52.0, accesskit pulls in 0.59.0, rfd pulls 0.48, webbrowser pulls 0.45.0 (via jni)
56+
{ name = "windows-sys" }, # mostly hopeless to avoid
5857
]
5958
skip-tree = [
6059
{ name = "rfd" }, # example dependency
60+
{ name = "windows" }, # the ecosystem is currently transitioning from 0.58 to 0.61
6161
]
6262

6363

0 commit comments

Comments
 (0)