From 52532d257985a60277b3277af19da62f9cffdf0b Mon Sep 17 00:00:00 2001 From: John Nunley Date: Sun, 4 Feb 2024 16:17:06 -0800 Subject: [PATCH] chore: Fix failing CI Signed-off-by: John Nunley --- .github/workflows/ci.yml | 2 +- deny.toml | 4 +++- run-wasm/Cargo.toml | 3 +-- winit-core/src/event.rs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7608fcf5d..bdbc45db5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - { name: 'Linux 64bit', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, } - { name: 'X11', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=x11' } - { name: 'Wayland', target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: '--no-default-features --features=wayland,wayland-dlopen' } - - { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } + - { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--manifest-path=winit/Cargo.toml --features=android-native-activity', cmd: 'apk --' } - { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest, } - { name: 'macOS', target: x86_64-apple-darwin, os: macos-latest, } - { name: 'iOS x86_64', target: x86_64-apple-ios, os: macos-latest, } diff --git a/deny.toml b/deny.toml index 317542b86..c8a368c35 100644 --- a/deny.toml +++ b/deny.toml @@ -35,7 +35,9 @@ skip = [ { name = "bitflags" }, # the ecosystem is in the process of migrating. { name = "libloading" }, # x11rb uses a different version until the next update ] -skip-tree = [] +skip-tree = [ + { name = "run-wasm", version = "0.1.0" } +] [licenses] diff --git a/run-wasm/Cargo.toml b/run-wasm/Cargo.toml index 3ac77b26d..d1868e3a9 100644 --- a/run-wasm/Cargo.toml +++ b/run-wasm/Cargo.toml @@ -2,8 +2,7 @@ name = "run-wasm" version = "0.1.0" edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +publish = false [dependencies] cargo-run-wasm = "0.2.0" diff --git a/winit-core/src/event.rs b/winit-core/src/event.rs index d5681bb06..2fd4f5469 100644 --- a/winit-core/src/event.rs +++ b/winit-core/src/event.rs @@ -715,7 +715,7 @@ pub struct KeyEvent { /// - **Web:** Dead keys might be reported as the real key instead /// of `Dead` depending on the browser/OS. /// - /// [`key_without_modifiers`]: crate::platform::modifier_supplement::KeyEventExtModifierSupplement::key_without_modifiers + /// [`key_without_modifiers`]: https://docs.rs/winit/latest/winit/platform/modifier_supplement/trait.KeyEventExtModifierSupplement.html#tymethod.key_without_modifiers pub logical_key: keyboard::Key, /// Contains the text produced by this keypress.