Skip to content

Commit 2454249

Browse files
committed
Merge branch 'main' into antoine/filt9-slash-in-query
2 parents ea2d4b0 + f9aad6a commit 2454249

File tree

18 files changed

+102
-97
lines changed

18 files changed

+102
-97
lines changed

.github/workflows/contrib_checks.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ env:
3232
CARGO_INCREMENTAL: "0"
3333

3434
# Sourced from https://vulkan.lunarg.com/sdk/home#linux
35-
VULKAN_SDK_VERSION: "1.3.296.0"
35+
VULKAN_SDK_VERSION: "1.3.290.0"
3636

3737
defaults:
3838
run:
@@ -107,7 +107,7 @@ jobs:
107107
# Install the Vulkan SDK, so we can use the software rasterizer.
108108
# TODO(andreas): It would be nice if `setup_software_rasterizer.py` could do that for us as well (note though that this action here is very fast when cached!)
109109
- name: Install Vulkan SDK
110-
uses: jakoch/install-vulkan-sdk-action@v1.0.5
110+
uses: rerun-io/install-vulkan-sdk-action@v1.1.0
111111
with:
112112
vulkan_version: ${{ env.VULKAN_SDK_VERSION }}
113113
install_runtime: true

.github/workflows/reusable_checks_rust.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737
RUST_BACKTRACE: full
3838

3939
# Sourced from https://vulkan.lunarg.com/sdk/home#linux
40-
VULKAN_SDK_VERSION: "1.3.296.0"
40+
VULKAN_SDK_VERSION: "1.3.290.0"
4141

4242
defaults:
4343
run:
@@ -75,7 +75,7 @@ jobs:
7575
# Install the Vulkan SDK, so we can use the software rasterizer.
7676
# TODO(andreas): It would be nice if `setup_software_rasterizer.py` could do that for us as well (note though that this action here is very fast when cached!)
7777
- name: Install Vulkan SDK
78-
uses: jakoch/install-vulkan-sdk-action@v1.0.5
78+
uses: rerun-io/install-vulkan-sdk-action@v1.1.0
7979
with:
8080
vulkan_version: ${{ env.VULKAN_SDK_VERSION }}
8181
install_runtime: true
@@ -141,7 +141,7 @@ jobs:
141141
# TODO(andreas): It would be nice if `setup_software_rasterizer.py` could do that for us as well (note though that this action here is very fast when cached!)
142142
- name: Install Vulkan SDK
143143
if: ${{ matrix.name != 'macos' }}
144-
uses: jakoch/install-vulkan-sdk-action@v1.0.5
144+
uses: rerun-io/install-vulkan-sdk-action@v1.1.0
145145
with:
146146
vulkan_version: ${{ env.VULKAN_SDK_VERSION }}
147147
install_runtime: true

.typos.toml

+2
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,6 @@ extend-ignore-re = [
158158
"PNG.?", # Workaround for https://github.com/crate-ci/typos/issues/967
159159

160160
"_LEVL_", # USed in air_traffic_data.py
161+
162+
"thrEEone", # Used in a test
161163
]

Cargo.lock

+51-37
Original file line numberDiff line numberDiff line change
@@ -1956,8 +1956,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
19561956

19571957
[[package]]
19581958
name = "ecolor"
1959-
version = "0.30.0"
1960-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
1959+
version = "0.31.0"
1960+
source = "registry+https://github.com/rust-lang/crates.io-index"
1961+
checksum = "878e9005799dd739e5d5d89ff7480491c12d0af571d44399bcaefa1ee172dd76"
19611962
dependencies = [
19621963
"bytemuck",
19631964
"color-hex",
@@ -1973,8 +1974,9 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
19731974

19741975
[[package]]
19751976
name = "eframe"
1976-
version = "0.30.0"
1977-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
1977+
version = "0.31.0"
1978+
source = "registry+https://github.com/rust-lang/crates.io-index"
1979+
checksum = "eba4c50d905804fe9ec4e159fde06b9d38f9440228617ab64a03d7a2091ece63"
19781980
dependencies = [
19791981
"ahash",
19801982
"bytemuck",
@@ -2012,8 +2014,9 @@ dependencies = [
20122014

20132015
[[package]]
20142016
name = "egui"
2015-
version = "0.30.0"
2016-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2017+
version = "0.31.0"
2018+
source = "registry+https://github.com/rust-lang/crates.io-index"
2019+
checksum = "7d2768eaa6d5c80a6e2a008da1f0e062dff3c83eb2b28605ea2d0732d46e74d6"
20172020
dependencies = [
20182021
"accesskit",
20192022
"ahash",
@@ -2030,8 +2033,9 @@ dependencies = [
20302033

20312034
[[package]]
20322035
name = "egui-wgpu"
2033-
version = "0.30.0"
2034-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2036+
version = "0.31.0"
2037+
source = "registry+https://github.com/rust-lang/crates.io-index"
2038+
checksum = "6d8151704bcef6271bec1806c51544d70e79ef20e8616e5eac01facfd9c8c54a"
20352039
dependencies = [
20362040
"ahash",
20372041
"bytemuck",
@@ -2049,8 +2053,9 @@ dependencies = [
20492053

20502054
[[package]]
20512055
name = "egui-winit"
2052-
version = "0.30.0"
2053-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2056+
version = "0.31.0"
2057+
source = "registry+https://github.com/rust-lang/crates.io-index"
2058+
checksum = "ace791b367c1f63e6044aef2f3834904509d1d1a6912fd23ebf3f6a9af92cd84"
20542059
dependencies = [
20552060
"accesskit_winit",
20562061
"ahash",
@@ -2069,8 +2074,9 @@ dependencies = [
20692074

20702075
[[package]]
20712076
name = "egui_commonmark"
2072-
version = "0.19.0"
2073-
source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#6b58084e686c419db397ecfa22d7e884847b0f6f"
2077+
version = "0.20.0"
2078+
source = "registry+https://github.com/rust-lang/crates.io-index"
2079+
checksum = "4a1e5d9a91b1b7a320c9b7f56d1878416d7c9bab3eaf337b036e0ddfabf58623"
20742080
dependencies = [
20752081
"egui",
20762082
"egui_commonmark_backend",
@@ -2080,8 +2086,9 @@ dependencies = [
20802086

20812087
[[package]]
20822088
name = "egui_commonmark_backend"
2083-
version = "0.19.0"
2084-
source = "git+https://github.com/rerun-io/egui_commonmark.git?branch=egui-update#6b58084e686c419db397ecfa22d7e884847b0f6f"
2089+
version = "0.20.0"
2090+
source = "registry+https://github.com/rust-lang/crates.io-index"
2091+
checksum = "efb41b6833a6aaa99ca5c4f8e75b2410d69a7b3e30148d413f541147404a0dfa"
20852092
dependencies = [
20862093
"egui",
20872094
"egui_extras",
@@ -2090,8 +2097,9 @@ dependencies = [
20902097

20912098
[[package]]
20922099
name = "egui_extras"
2093-
version = "0.30.0"
2094-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2100+
version = "0.31.0"
2101+
source = "registry+https://github.com/rust-lang/crates.io-index"
2102+
checksum = "b5b5cf69510eb3d19211fc0c062fb90524f43fe8e2c012967dcf0e2d81cb040f"
20952103
dependencies = [
20962104
"ahash",
20972105
"egui",
@@ -2107,8 +2115,9 @@ dependencies = [
21072115

21082116
[[package]]
21092117
name = "egui_glow"
2110-
version = "0.30.0"
2111-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2118+
version = "0.31.0"
2119+
source = "registry+https://github.com/rust-lang/crates.io-index"
2120+
checksum = "9a53e2374a964c3c793cb0b8ead81bca631f24974bc0b747d1a5622f4e39fdd0"
21122121
dependencies = [
21132122
"ahash",
21142123
"bytemuck",
@@ -2124,8 +2133,9 @@ dependencies = [
21242133

21252134
[[package]]
21262135
name = "egui_kittest"
2127-
version = "0.30.0"
2128-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2136+
version = "0.31.0"
2137+
source = "registry+https://github.com/rust-lang/crates.io-index"
2138+
checksum = "e4a9133e9f6601f7c74edc78dd46b24034bbcf1b99f1bf268ef7b65cf09560ab"
21292139
dependencies = [
21302140
"dify",
21312141
"eframe",
@@ -2139,8 +2149,9 @@ dependencies = [
21392149

21402150
[[package]]
21412151
name = "egui_plot"
2142-
version = "0.30.0"
2143-
source = "git+https://github.com/emilk/egui_plot.git?branch=main#1990f2ad1e1e71adbffacbfe43f132ace07d76f3"
2152+
version = "0.31.0"
2153+
source = "registry+https://github.com/rust-lang/crates.io-index"
2154+
checksum = "1794c66fb727dac28dffed2e4b548e5118d1cccc331d368a35411d68725dde71"
21442155
dependencies = [
21452156
"ahash",
21462157
"egui",
@@ -2149,9 +2160,9 @@ dependencies = [
21492160

21502161
[[package]]
21512162
name = "egui_table"
2152-
version = "0.2.0"
2163+
version = "0.3.0"
21532164
source = "registry+https://github.com/rust-lang/crates.io-index"
2154-
checksum = "dc957dce337da3794d73f0c20a998e205850ed8a0fa1410432bddf31133667f8"
2165+
checksum = "448481435bd5741d1636fcd52775bef23eb25692927c8f2d06e72c0c2836b9ab"
21552166
dependencies = [
21562167
"egui",
21572168
"serde",
@@ -2160,8 +2171,9 @@ dependencies = [
21602171

21612172
[[package]]
21622173
name = "egui_tiles"
2163-
version = "0.11.0"
2164-
source = "git+https://github.com/rerun-io/egui_tiles?branch=emilk/update-egui#4876446fd618c59571490c7a637043d569f2e531"
2174+
version = "0.12.0"
2175+
source = "registry+https://github.com/rust-lang/crates.io-index"
2176+
checksum = "67756b63b283a65bd0534b0c2a5fb1a12a5768bb6383d422147cc93193d09cfc"
21652177
dependencies = [
21662178
"ahash",
21672179
"egui",
@@ -2194,8 +2206,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
21942206

21952207
[[package]]
21962208
name = "emath"
2197-
version = "0.30.0"
2198-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2209+
version = "0.31.0"
2210+
source = "registry+https://github.com/rust-lang/crates.io-index"
2211+
checksum = "55b7b6be5ad1d247f11738b0e4699d9c20005ed366f2c29f5ec1f8e1de180bc2"
21992212
dependencies = [
22002213
"bytemuck",
22012214
"serde",
@@ -2310,8 +2323,9 @@ dependencies = [
23102323

23112324
[[package]]
23122325
name = "epaint"
2313-
version = "0.30.0"
2314-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2326+
version = "0.31.0"
2327+
source = "registry+https://github.com/rust-lang/crates.io-index"
2328+
checksum = "275b665a7b9611d8317485187e5458750850f9e64604d3c58434bb3fc1d22915"
23152329
dependencies = [
23162330
"ab_glyph",
23172331
"ahash",
@@ -2329,8 +2343,9 @@ dependencies = [
23292343

23302344
[[package]]
23312345
name = "epaint_default_fonts"
2332-
version = "0.30.0"
2333-
source = "git+https://github.com/emilk/egui.git?branch=master#c6bda9a38c08c8e3e21e2062a2ede5b59d1c6a20"
2346+
version = "0.31.0"
2347+
source = "registry+https://github.com/rust-lang/crates.io-index"
2348+
checksum = "9343d356d7cac894dacafc161b4654e0881301097bdf32a122ed503d97cb94b6"
23342349

23352350
[[package]]
23362351
name = "equivalent"
@@ -3901,7 +3916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
39013916
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
39023917
dependencies = [
39033918
"cfg-if",
3904-
"windows-targets 0.52.6",
3919+
"windows-targets 0.48.5",
39053920
]
39063921

39073922
[[package]]
@@ -5265,7 +5280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
52655280
checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
52665281
dependencies = [
52675282
"bytes",
5268-
"heck 0.4.1",
5283+
"heck 0.5.0",
52695284
"itertools 0.13.0",
52705285
"log",
52715286
"multimap",
@@ -5775,7 +5790,6 @@ dependencies = [
57755790
"re_tracing",
57765791
"re_tuid",
57775792
"re_types_core",
5778-
"serde",
57795793
"similar-asserts",
57805794
"tap",
57815795
"thiserror 1.0.65",
@@ -9490,9 +9504,9 @@ dependencies = [
94909504

94919505
[[package]]
94929506
name = "walkers"
9493-
version = "0.32.0"
9507+
version = "0.34.0"
94949508
source = "registry+https://github.com/rust-lang/crates.io-index"
9495-
checksum = "70ca9bf7f5ff8a6d57de654d06fb25e5c6d60e0acc7e938d6fc15324b8e22a2f"
9509+
checksum = "e15ae9bf81b8cf852ecacf362a5d720ba0b523add2c806ffb3c57731d259c43a"
94969510
dependencies = [
94979511
"egui",
94989512
"egui_extras",

Cargo.toml

+23-23
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,27 @@ dav1d = { package = "re_rav1d", version = "0.1.3", default-features = false }
127127
# dav1d = { version = "0.10.3" } # Requires separate install of `dav1d` library. Fast in debug builds. Useful for development.
128128

129129
# egui-crates:
130-
ecolor = "0.30.0"
131-
eframe = { version = "0.30.0", default-features = false, features = [
130+
ecolor = "0.31.0"
131+
eframe = { version = "0.31.0", default-features = false, features = [
132132
"accesskit",
133133
"default_fonts",
134134
"wayland",
135135
"x11",
136136
] }
137-
egui = { version = "0.30.0", features = [
137+
egui = { version = "0.31.0", features = [
138138
"callstack",
139139
"color-hex",
140140
"log",
141141
"rayon",
142142
] }
143-
egui_commonmark = { version = "0.19", default-features = false }
144-
egui_extras = { version = "0.30.0", features = ["http", "image", "serde"] }
145-
egui_kittest = { version = "0.30.0", features = ["wgpu", "snapshot", "eframe"] }
146-
egui_plot = "0.30.0" # https://github.com/emilk/egui_plot
147-
egui_table = "0.2.0" # https://github.com/rerun-io/egui_table
148-
egui_tiles = "0.11.0" # https://github.com/rerun-io/egui_tiles
149-
egui-wgpu = "0.30.0"
150-
emath = "0.30.0"
143+
egui_commonmark = { version = "0.20.0", default-features = false }
144+
egui_extras = { version = "0.31.0", features = ["http", "image", "serde"] }
145+
egui_kittest = { version = "0.31.0", features = ["wgpu", "snapshot", "eframe"] }
146+
egui_plot = "0.31.0" # https://github.com/emilk/egui_plot
147+
egui_table = "0.3.0" # https://github.com/rerun-io/egui_table
148+
egui_tiles = "0.12.0" # https://github.com/rerun-io/egui_tiles
149+
egui-wgpu = "0.31.0"
150+
emath = "0.31.0"
151151

152152
# All of our direct external dependencies should be found here:
153153
ahash = "0.8"
@@ -307,7 +307,7 @@ url = "2.3"
307307
uuid = "1.1"
308308
vec1 = "1.8"
309309
walkdir = "2.0"
310-
walkers = "0.32"
310+
walkers = "0.34.0"
311311
# TODO(#8766): `rerun_js/web-viewer/build-wasm.mjs` is HIGHLY sensitive to changes in `wasm-bindgen`.
312312
# Whenever updating `wasm-bindgen`, update this and the narrower dependency specifications in
313313
# `crates/viewer/re_viewer/Cargo.toml`, and make sure that the build script still works.
@@ -573,13 +573,13 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
573573
# Prefer patching with `branch` over `rev` and let `Cargo.lock` handle the commit hash.
574574
# That makes it easy to upade with `cargo update -p $CRATE`.
575575

576-
ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
577-
eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
578-
egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
579-
egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
580-
egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
581-
egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
582-
emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
576+
# ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
577+
# eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
578+
# egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
579+
# egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
580+
# egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
581+
# egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
582+
# emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
583583

584584
# Useful while developing:
585585
# ecolor = { path = "../../egui/crates/ecolor" }
@@ -590,13 +590,13 @@ emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
590590
# egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
591591
# emath = { path = "../../egui/crates/emath" }
592592

593-
egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "main" }
593+
# egui_plot = { git = "https://github.com/emilk/egui_plot.git", branch = "main" }
594594
# egui_plot = { path = "../../egui_plot/egui_plot" }
595595

596-
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" }
597-
#egui_tiles = { path = "../egui_tiles" }
596+
# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" }
597+
# egui_tiles = { path = "../egui_tiles" }
598598

599-
egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", branch = "egui-update" } # https://github.com/lampsitter/egui_commonmark/pull/71
599+
# egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", branch = "egui-update" } # https://github.com/lampsitter/egui_commonmark/pull/71
600600

601601
# egui_commonmark = { path = "../../forks/egui_commonmark/egui_commonmark" }
602602

crates/store/re_chunk/Cargo.toml

+1-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ all-features = true
2323
default = []
2424

2525
## Enable (de)serialization using serde.
26-
serde = [
27-
"dep:serde",
28-
"re_log_types/serde",
29-
"re_tuid/serde",
30-
"re_types_core/serde",
31-
]
26+
serde = ["re_log_types/serde", "re_tuid/serde", "re_types_core/serde"]
3227

3328

3429
[dependencies]
@@ -59,9 +54,6 @@ similar-asserts.workspace = true
5954
tap.workspace = true
6055
thiserror.workspace = true
6156

62-
# Optional dependencies:
63-
serde = { workspace = true, optional = true, features = ["derive", "rc"] }
64-
6557
# Native dependencies:
6658
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
6759
crossbeam.workspace = true

0 commit comments

Comments
 (0)