Bump all dependencies

This patch applies all major and minor version bumps, with the exception
of `unicode-width` since it will need to be handled separately for
Unicode version 16.

alacritty/Cargo.toml

@@ -56,7 +56,7 @@ xdg = "2.5.0"
 png = { version = "0.17.5", default-features = false, optional = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa = "0.25.0"
+cocoa = "0.26.0"
 objc = "0.2.2"
 
 [target.'cfg(windows)'.dependencies]

alacritty_terminal/Cargo.toml

@@ -34,7 +34,7 @@ signal-hook = "0.3.10"
 [target.'cfg(windows)'.dependencies]
 piper = "0.2.1"
 miow = "0.6.0"
-windows-sys = { version = "0.52.0", features = [
+windows-sys = { version = "0.59.0", features = [
     "Win32_System_Console",
     "Win32_Foundation",
     "Win32_Security",

alacritty_terminal/src/tty/windows/child.rs

@@ -1,6 +1,7 @@
 use std::ffi::c_void;
 use std::io::Error;
 use std::num::NonZeroU32;
+use std::ptr;
 use std::sync::atomic::{AtomicPtr, Ordering};
 use std::sync::{mpsc, Arc, Mutex};
 
@@ -50,7 +51,7 @@ pub struct ChildExitWatcher {
     wait_handle: AtomicPtr<c_void>,
     event_rx: mpsc::Receiver<ChildEvent>,
     interest: Arc<Mutex<Option<Interest>>>,
-    child_handle: HANDLE,
+    child_handle: AtomicPtr<c_void>,
     pid: Option<NonZeroU32>,
 }
 
@@ -58,12 +59,12 @@ impl ChildExitWatcher {
     pub fn new(child_handle: HANDLE) -> Result<ChildExitWatcher, Error> {
         let (event_tx, event_rx) = mpsc::channel();
 
-        let mut wait_handle: HANDLE = 0;
+        let mut wait_handle: HANDLE = ptr::null_mut();
         let interest = Arc::new(Mutex::new(None));
         let sender_ref = Box::new(ChildExitSender {
             sender: event_tx,
             interest: interest.clone(),
-            child_handle: AtomicPtr::from(child_handle as *mut c_void),
+            child_handle: AtomicPtr::from(child_handle),
         });
 
         let success = unsafe {
@@ -82,11 +83,11 @@ impl ChildExitWatcher {
         } else {
             let pid = unsafe { NonZeroU32::new(GetProcessId(child_handle)) };
             Ok(ChildExitWatcher {
-                wait_handle: AtomicPtr::from(wait_handle as *mut c_void),
                 event_rx,
                 interest,
-                child_handle,
                 pid,
+                child_handle: AtomicPtr::from(child_handle),
+                wait_handle: AtomicPtr::from(wait_handle),
             })
         }
     }
@@ -112,7 +113,7 @@ impl ChildExitWatcher {
     /// If you terminate the process using this handle, the terminal will get a
     /// timeout error, and the child watcher will emit an `Exited` event.
     pub fn raw_handle(&self) -> HANDLE {
-        self.child_handle
+        self.child_handle.load(Ordering::Relaxed) as HANDLE
     }
 
     /// Retrieve the Process ID associated to the underlying child process.

alacritty_terminal/src/tty/windows/conpty.rs

@@ -72,7 +72,7 @@ impl ConptyApi {
         type LoadedFn = unsafe extern "system" fn() -> isize;
         unsafe {
             let hmodule = LoadLibraryW(w!("conpty.dll"));
-            if hmodule == 0 {
+            if hmodule.is_null() {
                 return None;
             }
             let create_fn = GetProcAddress(hmodule, s!("CreatePseudoConsole"))?;

extra/completions/_alacritty

@@ -15,17 +15,17 @@ _alacritty() {
 
     local context curcontext="$curcontext" state line
     _arguments "${_arguments_options[@]}" : \
-'--embed=[X11 window ID to embed Alacritty within (decimal or hexadecimal with "0x" prefix)]:EMBED: ' \
+'--embed=[X11 window ID to embed Alacritty within (decimal or hexadecimal with "0x" prefix)]:EMBED:_default' \
 '--config-file=[Specify alternative configuration file \[default\: \$XDG_CONFIG_HOME/alacritty/alacritty.toml\]]:CONFIG_FILE:_files' \
 '--socket=[Path for IPC socket creation]:SOCKET:_files' \
 '--working-directory=[Start the shell in the specified working directory]:WORKING_DIRECTORY:_files' \
-'*-e+[Command and args to execute (must be last argument)]:COMMAND: ' \
+'*-e+[Command and args to execute (must be last argument)]:COMMAND:_default' \
-'*--command=[Command and args to execute (must be last argument)]:COMMAND: ' \
+'*--command=[Command and args to execute (must be last argument)]:COMMAND:_default' \
-'-T+[Defines the window title \[default\: Alacritty\]]:TITLE: ' \
+'-T+[Defines the window title \[default\: Alacritty\]]:TITLE:_default' \
-'--title=[Defines the window title \[default\: Alacritty\]]:TITLE: ' \
+'--title=[Defines the window title \[default\: Alacritty\]]:TITLE:_default' \
-'--class=[Defines window class/app_id on X11/Wayland \[default\: Alacritty\]]:general> | <general>,<instance: ' \
+'--class=[Defines window class/app_id on X11/Wayland \[default\: Alacritty\]]:general> | <general>,<instance:_default' \
-'*-o+[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION: ' \
+'*-o+[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION:_default' \
-'*--option=[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION: ' \
+'*--option=[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION:_default' \
 '--print-events[Print all events to STDOUT]' \
 '(--daemon)--ref-test[Generates ref test]' \
 '(-v)*-q[Reduces the level of verbosity (the min level is -qq)]' \
@@ -64,13 +64,13 @@ _arguments "${_arguments_options[@]}" : \
             (create-window)
 _arguments "${_arguments_options[@]}" : \
 '--working-directory=[Start the shell in the specified working directory]:WORKING_DIRECTORY:_files' \
-'*-e+[Command and args to execute (must be last argument)]:COMMAND: ' \
+'*-e+[Command and args to execute (must be last argument)]:COMMAND:_default' \
-'*--command=[Command and args to execute (must be last argument)]:COMMAND: ' \
+'*--command=[Command and args to execute (must be last argument)]:COMMAND:_default' \
-'-T+[Defines the window title \[default\: Alacritty\]]:TITLE: ' \
+'-T+[Defines the window title \[default\: Alacritty\]]:TITLE:_default' \
-'--title=[Defines the window title \[default\: Alacritty\]]:TITLE: ' \
+'--title=[Defines the window title \[default\: Alacritty\]]:TITLE:_default' \
-'--class=[Defines window class/app_id on X11/Wayland \[default\: Alacritty\]]:general> | <general>,<instance: ' \
+'--class=[Defines window class/app_id on X11/Wayland \[default\: Alacritty\]]:general> | <general>,<instance:_default' \
-'*-o+[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION: ' \
+'*-o+[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION:_default' \
-'*--option=[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION: ' \
+'*--option=[Override configuration file options \[example\: '\''cursor.style="Beam"'\''\]]:OPTION:_default' \
 '--hold[Remain open after child process exit]' \
 '-h[Print help]' \
 '--help[Print help]' \
@@ -78,13 +78,13 @@ _arguments "${_arguments_options[@]}" : \
 ;;
 (config)
 _arguments "${_arguments_options[@]}" : \
-'-w+[Window ID for the new config]:WINDOW_ID: ' \
+'-w+[Window ID for the new config]:WINDOW_ID:_default' \
-'--window-id=[Window ID for the new config]:WINDOW_ID: ' \
+'--window-id=[Window ID for the new config]:WINDOW_ID:_default' \
 '()-r[Clear all runtime configuration changes]' \
 '()--reset[Clear all runtime configuration changes]' \
 '-h[Print help (see more with '\''--help'\'')]' \
 '--help[Print help (see more with '\''--help'\'')]' \
-'*::options -- Configuration file options \[example\: '\''cursor.style="Beam"'\''\]:' \
+'*::options -- Configuration file options \[example\: '\''cursor.style="Beam"'\''\]:_default' \
 && ret=0
 ;;
 (help)