rebase main

.github/workflows/labels.yml

@@ -40,3 +40,42 @@ jobs:
           mode: minimum
           count: 1
           labels: "📊 analytics, 🟦 blueprint, 🪳 bug, 🌊 C++ API, CLI, codegen/idl, 🧑‍💻 dev experience, dependencies, 📖 documentation, 💬 discussion, examples, exclude from changelog, 🪵 Log & send APIs, 📉 performance, 🐍 Python API, ⛃ re_datastore, 🔍 re_query, 📺 re_viewer, 🔺 re_renderer, 🚜 refactor, ⛴ release, 🦀 Rust API, 🔨 testing, ui, 🕸️ web"
+
+  wasm-bindgen-check:
+    name: Check wasm-bindgen version
+    if: ${{ github.event_name == 'pull_request' }}
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: prefix-dev/[email protected]
+        with:
+          pixi-version: v0.34.0
+
+      - name: Get current wasm-bindgen version
+        id: current-version
+        run: |
+          version=$(pixi run taplo get -f crates/viewer/re_viewer/Cargo.toml "target.*.dependencies.wasm-bindgen")
+          echo "current_version=$version" >> $GITHUB_OUTPUT
+
+      - name: Get previous wasm-bindgen version
+        id: previous-version
+        run: |
+          prev_ref=$(git rev-parse --abbrev-ref HEAD)
+          git checkout main
+
+          version=$(pixi run taplo get -f crates/viewer/re_viewer/Cargo.toml "target.*.dependencies.wasm-bindgen")
+          echo "previous_version=$version" >> $GITHUB_OUTPUT
+
+          git checkout $prev_ref
+
+      - name: Require label if versions changed
+        if: ${{ steps.current-version.outputs.current_version != steps.previous-version.outputs.previous_version }}
+        uses: mheap/github-action-required-labels@v3
+        with:
+          mode: exactly
+          count: 1
+          labels: "wasm-bindgen version update"

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",

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
 
 
 # ---------------------------------------------------------------------------------

crates/build/re_types_builder/src/docs.rs

@@ -1,6 +1,6 @@
 use crate::{codegen::Target, Objects};
 
-/// A high-level representation of the contetns of a flatbuffer docstring.
+/// A high-level representation of the contents of a flatbuffer docstring.
 #[derive(Debug, Clone)]
 pub struct Docs {
     /// All docmentation lines, including the leading tag, if any.

crates/store/re_entity_db/src/store_bundle.rs

@@ -78,7 +78,7 @@ impl StoreBundle {
     /// One is created if it doesn't already exist.
     pub fn entry(&mut self, id: &StoreId) -> &mut EntityDb {
         self.entity_dbs.entry(id.clone()).or_insert_with(|| {
-            re_log::debug!("Creating new store: {id}");
+            re_log::trace!("Creating new store: '{id}'");
             EntityDb::new(id.clone())
         })
     }
@@ -96,7 +96,7 @@ impl StoreBundle {
 
             let mut blueprint_db = EntityDb::new(id.clone());
 
-            re_log::debug!("Creating a new blueprint {id}");
+            re_log::trace!("Creating a new blueprint '{id}'");
 
             blueprint_db.set_store_info(re_log_types::SetStoreInfo {
                 row_id: *re_chunk::RowId::new(),

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(

crates/viewer/re_renderer/src/allocator/gpu_readback_belt.rs

@@ -274,8 +274,7 @@ impl GpuReadbackBelt {
             } else {
                 // Allocation might be bigger than a chunk!
                 let buffer_size = self.chunk_size.max(size_in_bytes);
-                // Happens relatively rarely, this is a noteworthy event!
-                re_log::debug!(
+                re_log::trace!(
                     "Allocating new GpuReadbackBelt chunk of size {:.1} MiB",
                     buffer_size as f32 / (1024.0 * 1024.0)
                 );

crates/viewer/re_space_view_spatial/src/mesh_cache.rs

@@ -63,7 +63,7 @@ impl MeshCache {
             .or_default()
             .entry(key)
             .or_insert_with(|| {
-                re_log::debug!("Loading CPU mesh {name:?}…");
+                re_log::trace!("Loading CPU mesh {name:?}…");
 
                 let result = LoadedMesh::load(name.to_owned(), mesh, render_ctx);
 

crates/viewer/re_space_view_spatial/src/proc_mesh.rs

@@ -164,7 +164,7 @@ impl WireframeCache {
             .or_insert_with(|| {
                 re_tracing::profile_scope!("proc_mesh::WireframeCache(miss)", format!("{key:?}"));
 
-                re_log::debug!("Generating wireframe mesh {key:?}…");
+                re_log::trace!("Generating wireframe mesh {key:?}…");
 
                 match generate_wireframe(&key, render_ctx) {
                     Ok(mesh) => Some(Arc::new(mesh)),
@@ -311,7 +311,7 @@ impl SolidCache {
             .or_insert_with(|| {
                 re_tracing::profile_scope!("proc_mesh::SolidCache(miss)", format!("{key:?}"));
 
-                re_log::debug!("Generating solid mesh {key:?}…");
+                re_log::trace!("Generating solid mesh {key:?}…");
 
                 match generate_solid(&key, render_ctx) {
                     Ok(mesh) => Some(mesh),

crates/viewer/re_viewer/src/app.rs

@@ -1178,7 +1178,7 @@ impl App {
                     // updates the app-id when changing the recording.
                     match store_id.kind {
                         StoreKind::Recording => {
-                            re_log::debug!("Opening a new recording: {store_id}");
+                            re_log::trace!("Opening a new recording: '{store_id}'");
                             store_hub.set_active_recording_id(store_id.clone());
 
                             // Also select the new recording:
@@ -1214,7 +1214,7 @@ impl App {
                     }
                     StoreKind::Blueprint => {
                         if let Some(info) = entity_db.store_info() {
-                            re_log::debug!(
+                            re_log::trace!(
                                 "Activating blueprint that was loaded from {channel_source}"
                             );
                             let app_id = info.application_id.clone();

crates/viewer/re_viewer/src/lib.rs

@@ -252,7 +252,7 @@ pub fn wake_up_ui_thread_on_each_msg<T: Send + 'static>(
                     break;
                 }
             }
-            re_log::debug!("Shutting down ui_waker thread");
+            re_log::trace!("Shutting down ui_waker thread");
         })
         .unwrap();
     new_rx

crates/viewer/re_viewer_context/src/store_hub.rs

@@ -487,7 +487,7 @@ impl StoreHub {
             }
         }
 
-        re_log::debug!("Switching default blueprint for {app_id} to {blueprint_id}");
+        re_log::trace!("Switching default blueprint for '{app_id}' to '{blueprint_id}'");
         self.default_blueprint_by_app_id
             .insert(app_id.clone(), blueprint_id.clone());
 
@@ -532,8 +532,8 @@ impl StoreHub {
     ) -> anyhow::Result<()> {
         let new_id = StoreId::random(StoreKind::Blueprint);
 
-        re_log::debug!(
-            "Cloning {blueprint_id} as {new_id} the active blueprint for {app_id} to {blueprint_id}"
+        re_log::trace!(
+            "Cloning '{blueprint_id}' as '{new_id}' the active blueprint for '{app_id}' to '{blueprint_id}'"
         );
 
         let blueprint = self

examples/python/objectron/objectron/proto/a_r_capture_metadata.proto

@@ -336,15 +336,15 @@ message ARPlaneAnchor {
 
   // The classification status for the plane.
   enum PlaneClassificationStatus {
-    // The classfication process for the plane anchor has completed but the
+    // The classification process for the plane anchor has completed but the
     // result is inconclusive.
     UNKNOWN = 0;
     // No classication information can be provided (set on error or if the
     // device does not support plane classification).
     UNAVAILABLE = 1;
     // The classification process has not completed.
     UNDETERMINED = 2;
-    // The classfication process for the plane anchor has completed.
+    // The classification process for the plane anchor has completed.
     KNOWN = 3;
   }