Merge branch 'main' into resolve-clippy-unwrap_used-in-re_viewer

rerun-io · Jan 24, 2025 · a1df8c2 · a1df8c2
2 parents fd9e54a + 5a97949
commit a1df8c2
Show file tree

Hide file tree

Showing 340 changed files with 11,503 additions and 9,610 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -176,5 +176,18 @@
                 "RAYON_NUM_THREADS": "1" // less confusing debugging experience
             }
         },
+        {
+            "name": "(Windows) Launch & debug C++ snippet",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/debug/docs/snippets/video_auto_frames.exe",
+            "args": [
+                "${workspaceFolder}/tests/assets/video/Big_Buck_Bunny_1080_10s_av1.mp4"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${fileDirname}",
+            "environment": [],
+            "console": "externalTerminal"
+        },
     ]
 }
diff --git a/Cargo.lock b/Cargo.lock
@@ -1958,7 +1958,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 [[package]]
 name = "ecolor"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "bytemuck",
  "color-hex",
@@ -1975,7 +1975,7 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
 [[package]]
 name = "eframe"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2014,7 +2014,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "accesskit",
  "ahash",
@@ -2032,7 +2032,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2051,7 +2051,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "accesskit_winit",
  "ahash",
@@ -2092,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "ahash",
  "egui",
@@ -2109,7 +2109,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2126,7 +2126,7 @@ dependencies = [
 [[package]]
 name = "egui_kittest"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "dify",
  "eframe",
@@ -2197,7 +2197,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "emath"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2313,7 +2313,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -2332,7 +2332,7 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 version = "0.30.0"
-source = "git+https://github.com/emilk/egui.git?rev=30e66e457575096bd60e95800e7dd9fd755c0046#30e66e457575096bd60e95800e7dd9fd755c0046"
+source = "git+https://github.com/emilk/egui.git?branch=master#bc5f908b80cbcb20a728b36d20df860d90a29263"
 
 [[package]]
 name = "equivalent"
@@ -3900,7 +3900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5219,7 +5219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
 dependencies = [
  "bytes",
- "heck 0.5.0",
+ "heck 0.4.1",
  "itertools 0.13.0",
  "log",
  "multimap",
@@ -5446,7 +5446,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5584,8 +5584,9 @@ dependencies = [
 
 [[package]]
 name = "re_arrow2"
-version = "0.18.1"
-source = "git+https://github.com/rerun-io/re_arrow2.git?branch=main#61ac48418df229584155c5f669477bedf76d4505"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6973c87de24c9de7292447fa896f229278b010cb3fb5e7f4f857447e64e1bb6f"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -6351,7 +6352,6 @@ dependencies = [
  "web-sys",
  "web-time",
  "wgpu",
- "wgpu-types",
 ]
 
 [[package]]
@@ -6561,6 +6561,7 @@ dependencies = [
  "rayon",
  "re_build_tools",
  "re_byte_size",
+ "re_error",
  "re_format",
  "re_log",
  "re_log_types",
@@ -9832,9 +9833,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "24.0.0"
+version = "24.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e41253fc7b660735e2a2d9a58c563f2a047d3cc3445293d8f4095538c9e8afbe"
+checksum = "47f55718f85c2fa756edffa0e7f0e0a60aba463d1362b57e23123c58f035e4b6"
 dependencies = [
  "arrayvec",
  "bitflags 2.8.0",
@@ -9961,7 +9962,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

diff --git a/Cargo.toml b/Cargo.toml
@@ -155,7 +155,7 @@ argh = "0.1.12"
 array-init = "2.1"
 arrow = { version = "53.4", default-features = false }
 arrow-schema = { version = "53.4", default-features = false }
-arrow2 = { package = "re_arrow2", version = "0.18", features = ["arrow"] }
+arrow2 = { package = "re_arrow2", version = "0.18.2", features = ["arrow"] }
 async-executor = "1.0"
 async-stream = "0.3"
 backtrace = "0.3"
@@ -338,8 +338,6 @@ wgpu = { version = "24.0", default-features = false, features = [
   # Other:
   "fragile-send-sync-non-atomic-wasm",
 ] }
-# TODO(gfx-rs/wgpu#6962): There's a type export missing in 24.0.0, so we need to get it directly from wgpu-types.
-wgpu-types = "24.0"
 xshell = "0.2"
 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
 
@@ -575,13 +573,13 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
 # Prefer patching with `branch` over `rev` and let `Cargo.lock` handle the commit hash.
 # That makes it easy to upade with `cargo update -p $CRATE`.
 
-ecolor = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }       # egui master 2025-01-20
-eframe = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }       # egui master 2025-01-20
-egui = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }         # egui master 2025-01-20
-egui_extras = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }  # egui master 2025-01-20
-egui_kittest = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" } # egui master 2025-01-20
-egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }    # egui master 2025-01-20
-emath = { git = "https://github.com/emilk/egui.git", rev = "30e66e457575096bd60e95800e7dd9fd755c0046" }        # egui master 2025-01-20
+ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
+eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
+egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
+egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
+egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
+emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
 
 # Useful while developing:
 # ecolor = { path = "../../egui/crates/ecolor" }
@@ -604,4 +602,4 @@ egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", bra
 
 # dav1d = { path = "/home/cmc/dev/rerun-io/rav1d", package = "re_rav1d", version = "0.1.1" }
 
-re_arrow2 = { git = "https://github.com/rerun-io/re_arrow2.git", branch = "main" }
+# re_arrow2 = { git = "https://github.com/rerun-io/re_arrow2.git", branch = "main" }