From 884001f63327a8cb362bd75b35dc80a0706894de Mon Sep 17 00:00:00 2001
From: Matt Campbell <mattcampbell@pobox.com>
Date: Tue, 29 Nov 2022 19:47:59 -0600
Subject: [PATCH] Update AccessKit

---
 Cargo.lock                   | 20 +++++++-------------
 crates/egui-winit/Cargo.toml |  2 +-
 crates/egui-winit/src/lib.rs |  4 ++--
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 865490ab..5e562837 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_macos"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64dbd336bb7fc43fa3bfc8b59e5cbab880421983dd043d540ce3d6db3f099e4c"
+checksum = "efa5b671f649a554d8c27b238ba69e5eac8be4809713ebc6cfeca78ebb0ee639"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -54,14 +54,14 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40846a52cc28969f8e9f10fdcc946c2119121e38e9388c42cbdf1a4b6c0a7aef"
+checksum = "fa69568d9c5df0b964f1ca1bc49e865732f256832cf21775b08a736975501682"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "arrayvec 0.7.2",
- "lazy-init",
+ "once_cell",
  "parking_lot",
  "paste",
  "windows 0.42.0",
@@ -69,9 +69,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d8630e275f2958ddab357e7dfc11abe41d28b1eba114e0d80cf3df672426fd"
+checksum = "ee81f4dce90c61ccbf8579ad2f0c7650022e8a5bb8bd10cd62438cad6330a2ff"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -2236,12 +2236,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "lazy-init"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f40963626ac12dcaf92afc15e4c3db624858c92fd9f8ba2125eaada3ac2706f"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml
index b1d55564..3d24b8f2 100644
--- a/crates/egui-winit/Cargo.toml
+++ b/crates/egui-winit/Cargo.toml
@@ -61,7 +61,7 @@ winit = { version = "0.27.2", default-features = false }
 document-features = { version = "0.2", optional = true }
 
 # feature accesskit
-accesskit_winit = { version = "0.6.6", optional = true }
+accesskit_winit = { version = "0.7.0", optional = true }
 
 puffin = { version = "0.14", optional = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs
index a54e2b07..9c594483 100644
--- a/crates/egui-winit/src/lib.rs
+++ b/crates/egui-winit/src/lib.rs
@@ -136,7 +136,7 @@ impl State {
     ) {
         self.accesskit = Some(accesskit_winit::Adapter::new(
             window,
-            Box::new(move || {
+            move || {
                 // This function is called when an accessibility client
                 // (e.g. screen reader) makes its first request. If we got here,
                 // we know that an accessibility tree is actually wanted.
@@ -146,7 +146,7 @@ impl State {
                 // real accessibility tree.
                 egui_ctx.accesskit_activated();
                 egui::accesskit_placeholder_tree_update()
-            }),
+            },
             event_loop_proxy,
         ));
     }