Update a couple of dependencies (#7976)

### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) To run all checks from `main`, comment on the PR with `@rerun-bot full-check`.
rerun-io · Nov 4, 2024 · ff1305e · ff1305e
1 parent 5d7ce8e
commit ff1305e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -623,7 +623,7 @@ dependencies = [
  "futures-io",
  "futures-lite",
  "parking",
- "polling 3.7.3",
+ "polling",
  "rustix",
  "slab",
  "tracing",
@@ -1110,7 +1110,7 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
  "bitflags 2.6.0",
  "log",
- "polling 3.7.3",
+ "polling",
  "rustix",
  "slab",
  "thiserror",
@@ -2384,9 +2384,9 @@ dependencies = [
 
 [[package]]
 name = "fixed"
-version = "1.27.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048"
+checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a"
 dependencies = [
  "az",
  "bytemuck",
@@ -3304,9 +3304,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "infer"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
+checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
 dependencies = [
  "cfb",
 ]
@@ -4715,22 +4715,6 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "polling"
 version = "3.7.3"
@@ -6552,7 +6536,7 @@ dependencies = [
  "document-features",
  "ewebsock",
  "parking_lot",
- "polling 2.8.0",
+ "polling",
  "re_format",
  "re_log",
  "re_log_types",

diff --git a/Cargo.toml b/Cargo.toml
@@ -178,7 +178,7 @@ econtext = "0.2" # Prints error contexts on crashes
 ehttp = "0.5.0"
 enumset = "1.0.12"
 env_logger = { version = "0.10", default-features = false }
-fixed = { version = "<1.28", default-features = false } # 1.28+ is MSRV 1.79+
+fixed = { version = "1.28", default-features = false }
 flatbuffers = "23.0"
 futures-channel = "0.3"
 futures-util = { version = "0.3", default-features = false }
@@ -192,7 +192,7 @@ image = { version = "0.25", default-features = false }
 indent = "0.1"
 indexmap = "2.1" # Version chosen to align with other dependencies
 indicatif = "0.17.7" # Progress bar
-infer = "0.15" # infer MIME type by checking the magic number signaturefer MIME type by checking the magic number signature
+infer = "0.16" # infer MIME type by checking the magic number signaturefer MIME type by checking the magic number signature
 insta = "1.23"
 itertools = "0.13"
 js-sys = "0.3"
@@ -223,7 +223,7 @@ pathdiff = "0.2"
 pico-args = "0.5"
 ply-rs = { version = "0.1", default-features = false }
 poll-promise = "0.3"
-polling = "2.2.0"
+polling = "3.7.3"
 pollster = "0.3"
 prettyplease = "0.2"
 proc-macro2 = { version = "1.0", default-features = false }
@@ -318,7 +318,7 @@ wgpu = { version = "22.1", default-features = false, features = [
 wgpu-core = "22.1"
 wgpu-types = "22.0"
 xshell = "0.2"
-zip = { version = "0.6", default-features = false }
+zip = { version = "0.6", default-features = false } # We're stuck on 0.6 because https://crates.io/crates/protoc-prebuilt is still using 0.6
 
 
 # ---------------------------------------------------------------------------------

diff --git a/crates/store/re_ws_comms/src/server.rs b/crates/store/re_ws_comms/src/server.rs
@@ -183,12 +183,15 @@ impl RerunServer {
         // on the same poller.
         let listener_poll_key = 1;
 
-        if let Err(err) = poller.add(listener_socket, Event::readable(listener_poll_key)) {
+        #[allow(unsafe_code)]
+        // SAFETY: `poller.add` requires a matching call to `poller.delete`, which we have below
+        if let Err(err) = unsafe { poller.add(listener_socket, Event::readable(listener_poll_key)) }
+        {
             re_log::error!("Error when polling listener socket for incoming connections: {err}");
             return;
         }
 
-        let mut events = Vec::new();
+        let mut events = polling::Events::new();
         loop {
             if let Err(err) = poller.wait(&mut events, None) {
                 re_log::warn!("Error polling WebSocket server listener: {err}");
@@ -199,7 +202,7 @@ impl RerunServer {
                 break;
             }
 
-            for event in events.drain(..) {
+            for event in events.iter() {
                 if event.key == listener_poll_key {
                     Self::accept_connection(
                         listener_socket,
@@ -210,7 +213,11 @@ impl RerunServer {
                     );
                 }
             }
+            events.clear();
         }
+
+        // This MUST be called before dropping `poller`!
+        poller.delete(listener_socket).ok();
     }
 
     fn accept_connection(