rerun-io · emilk · Oct 31, 2024 · Oct 31, 2024 · Oct 31, 2024 · Oct 31, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -237,7 +237,10 @@ quote = "1.0"
 rand = { version = "0.8", default-features = false }
 rand_distr = { version = "0.4", default-features = false }
 rayon = "1.7"
-rfd = { version = "0.12", default-features = false, features = ["xdg-portal"] }
+rfd = { version = "0.15", default-features = false, features = [
+  "async-std",
+  "xdg-portal",
+] }
 rmp-serde = "1"
 ron = "0.8.0"
 rust-format = "0.3"
@@ -274,7 +277,7 @@ tonic = { version = "0.12.3", default-features = false }
 tonic-build = { version = "0.12.3", default-features = false }
 tonic-web-wasm-client = "0.6"
 tracing = { version = "0.1", default-features = false }
-tungstenite = { version = "0.23", default-features = false }
+tungstenite = { version = "0.24", default-features = false }
 type-map = "0.5"
 typenum = "1.15"
 unindent = "0.2"
@@ -485,7 +488,6 @@ rest_pat_in_fully_bound_structs = "warn"
 same_functions_in_if_condition = "warn"
 semicolon_if_nothing_returned = "warn"
 should_panic_without_expect = "warn"
-significant_drop_tightening = "warn"
 single_match_else = "warn"
 str_split_at_newline = "warn"
 str_to_string = "warn"
@@ -534,6 +536,7 @@ iter_over_hash_type = "allow"
 let_underscore_untyped = "allow"
 missing_assert_message = "allow"
 missing_errors_doc = "allow"
+significant_drop_tightening = "allow" # An update of parking_lot made this trigger in a lot of places. TODO(emilk): fix those places
 
 [patch.crates-io]
 # Try to avoid patching crates! It prevents us from publishing the crates on crates.io.

diff --git a/crates/viewer/re_renderer/src/file_server.rs b/crates/viewer/re_renderer/src/file_server.rs
@@ -254,7 +254,7 @@ mod file_server_impl {
                     .ok()
             }
 
-            let paths = self
+            let paths: HashSet<PathBuf> = self
                 .events_rx
                 .try_iter()
                 .flat_map(|ev| {

diff --git a/crates/viewer/re_space_view_spatial/src/max_image_dimension_subscriber.rs b/crates/viewer/re_space_view_spatial/src/max_image_dimension_subscriber.rs
@@ -136,7 +136,7 @@ fn size_from_blob(blob: &dyn Array, media_type: Option<&dyn Array>) -> Option<[u
 
         let image_bytes = blob.0.as_slice();
 
-        let mut reader = image::io::Reader::new(std::io::Cursor::new(image_bytes));
+        let mut reader = image::ImageReader::new(std::io::Cursor::new(image_bytes));
 
         if let Some(format) = image::ImageFormat::from_mime_type(&media_type.0) {
             reader.set_format(format);

diff --git a/crates/viewer/re_space_view_spatial/src/picking_ui_pixel.rs b/crates/viewer/re_space_view_spatial/src/picking_ui_pixel.rs
@@ -582,6 +582,7 @@ fn pixel_value_string_from_gpu_texture(
             buffer_info,
         }),
     );
+    drop(readback_belt);
 
     {
         let mut encoder = render_ctx.active_frame.before_view_builder_encoder.lock();

diff --git a/crates/viewer/re_space_view_spatial/src/visualizers/videos.rs b/crates/viewer/re_space_view_spatial/src/visualizers/videos.rs
@@ -304,7 +304,7 @@ impl VideoFrameReferenceVisualizer {
                 Hash64::hash("video_error").hash64(),
                 render_ctx,
                 || {
-                    let mut reader = image::io::Reader::new(std::io::Cursor::new(
+                    let mut reader = image::ImageReader::new(std::io::Cursor::new(
                         re_ui::icons::VIDEO_ERROR.png_bytes,
                     ));
                     reader.set_format(image::ImageFormat::Png);

diff --git a/crates/viewer/re_viewer_context/src/cache/image_decode_cache.rs b/crates/viewer/re_viewer_context/src/cache/image_decode_cache.rs
@@ -86,7 +86,7 @@ fn decode_image(
 ) -> Result<ImageInfo, ImageLoadError> {
     re_tracing::profile_function!();
 
-    let mut reader = image::io::Reader::new(std::io::Cursor::new(image_bytes));
+    let mut reader = image::ImageReader::new(std::io::Cursor::new(image_bytes));
 
     if let Some(format) = image::ImageFormat::from_mime_type(media_type) {
         reader.set_format(format);

diff --git a/deny.toml b/deny.toml
@@ -69,9 +69,10 @@ skip-tree = [
   { name = "prost-build" },    # only used in objectron example
   { name = "prost-derive" },   # only used in objectron example
   { name = "toml_edit" },      # Old version via egui-winit, newer used by rustdoc-json
-  { name = "windows" },        # Old version used by accesskit_windows, newer version used by wgpu
   { name = "tower" },          # tonic depends on 0.4.3, but also transitively (axum) on 0.5.1
   { name = "walkers" },        # TODO(#7876): suppress that when `walkers` is updated
+  { name = "windows" },        # Old version used by accesskit_windows, newer version used by wgpu
+  { name = "zbus" },           # Old version via rfd
 ]
 
 

diff --git a/examples/rust/objectron/Cargo.toml b/examples/rust/objectron/Cargo.toml
@@ -16,10 +16,10 @@ rerun = { path = "../../../crates/top/rerun", features = [
 anyhow = "1.0"
 clap = { version = "4.0", features = ["derive"] }
 glam = "0.28"
-prost = "0.12"
+prost = "0.13"
 
 
 [build-dependencies]
 re_build_tools = { path = "../../../crates/build/re_build_tools" }
-prost-build = "0.12"
-protoc-prebuilt = "0.2"
+prost-build = "0.13"
+protoc-prebuilt = "0.3"
-Original file line number
+Diff line change
@@ Expand Up / @@ -582,6 +582,7 @@ fn pixel_value_string_from_gpu_texture( @@
                 buffer_info,
             }),
         );
+        drop(readback_belt);
         {
             let mut encoder = render_ctx.active_frame.before_view_builder_encoder.lock();
@@ Expand Down @@