diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54855a69c0..3f66a6127b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,15 +74,19 @@ jobs: - { name: 'iOS Aarch64', target: aarch64-apple-ios, os: macos-latest, } - { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, } exclude: - # Web on nightly needs extra arguments + # Web on nightly needs extra arguments + + - toolchain: nightly + platform: { name: 'Web' } + # Rustup is broken. - toolchain: nightly - platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest } + platform: { name: 'Windows 32bit GNU' } # Android is tested on stable-3 - toolchain: '1.73' - platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } + platform: { name: 'Android' } # Redox OS doesn't follow MSRV - toolchain: '1.73' - platform: { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest } + platform: { name: 'Redox OS' } include: - toolchain: '1.73' platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' } diff --git a/src/lib.rs b/src/lib.rs index 3dadb80d1b..68ce042e5e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -257,12 +257,10 @@ //! [`Window`]: window::Window //! [`WindowId`]: window::WindowId //! [`WindowAttributes`]: window::WindowAttributes -//! [window_new]: window::Window::new //! [`create_window`]: event_loop::ActiveEventLoop::create_window //! [`Window::id()`]: window::Window::id //! [`WindowEvent`]: event::WindowEvent //! [`DeviceEvent`]: event::DeviceEvent -//! [`Event::UserEvent`]: event::Event::UserEvent //! [`exiting()`]: crate::application::ApplicationHandler::exiting //! [`raw_window_handle`]: ./window/struct.Window.html#method.raw_window_handle //! [`raw_display_handle`]: ./window/struct.Window.html#method.raw_display_handle diff --git a/src/platform_impl/linux/mod.rs b/src/platform_impl/linux/mod.rs index 5600282f4d..2f0398ee8b 100644 --- a/src/platform_impl/linux/mod.rs +++ b/src/platform_impl/linux/mod.rs @@ -299,9 +299,9 @@ impl EventLoop { // Create the display based on the backend. match backend { #[cfg(wayland_platform)] - Backend::Wayland => EventLoop::new_wayland_any_thread().map_err(Into::into), + Backend::Wayland => EventLoop::new_wayland_any_thread(), #[cfg(x11_platform)] - Backend::X => EventLoop::new_x11_any_thread().map_err(Into::into), + Backend::X => EventLoop::new_x11_any_thread(), } } diff --git a/src/platform_impl/linux/x11/ime/input_method.rs b/src/platform_impl/linux/x11/ime/input_method.rs index 3a068cc27c..a8487bc4cc 100644 --- a/src/platform_impl/linux/x11/ime/input_method.rs +++ b/src/platform_impl/linux/x11/ime/input_method.rs @@ -177,7 +177,7 @@ unsafe fn get_xim_servers(xconn: &Arc) -> Result, GetXi ) .map_err(GetXimServersError::GetPropertyError)? .into_iter() - .map(ffi::Atom::from) + .map(|atom| atom as _) .collect::>(); let mut names: Vec<*const c_char> = Vec::with_capacity(atoms.len()); diff --git a/src/platform_impl/windows/window.rs b/src/platform_impl/windows/window.rs index 55799699d5..dd75dee90d 100644 --- a/src/platform_impl/windows/window.rs +++ b/src/platform_impl/windows/window.rs @@ -1341,7 +1341,7 @@ unsafe fn init( // This is because if the size is changed in WM_CREATE, the restored size will be stored in that // size. if fullscreen.is_some() { - win.set_fullscreen(fullscreen.map(Into::into)); + win.set_fullscreen(fullscreen); unsafe { force_window_active(win.window) }; } else if maximized { win.set_maximized(true); diff --git a/src/window.rs b/src/window.rs index 574e8a464e..0a0504bafc 100644 --- a/src/window.rs +++ b/src/window.rs @@ -1558,14 +1558,14 @@ impl ActivationToken { /// won't get focused automatically), but won't yield any errors. /// /// To obtain a valid token, use - #[cfg_attr(any(x11_platform, wayland_platform, docsrs), doc = " [`request_activation_token`].")] + #[cfg_attr( + any(x11_platform, wayland_platform, docsrs), + doc = " [`request_activation_token`](crate::platform::startup_notify::WindowExtStartupNotify::request_activation_token)." + )] #[cfg_attr( not(any(x11_platform, wayland_platform, docsrs)), doc = " `request_activation_token`." )] - /// - #[rustfmt::skip] - /// [`request_activation_token`]: crate::platform::startup_notify::WindowExtStartupNotify::request_activation_token pub fn from_raw(token: String) -> Self { Self { token } }