From c105e19661f2d691673a68afbc6a3ceaf578ca92 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 23 Jan 2025 18:57:47 +0100 Subject: [PATCH] Update to latest egui master (#8787) ### Contains these notable fixes * https://github.com/emilk/egui/pull/5631 * https://github.com/emilk/egui/pull/5555 --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 14 +++++++------- crates/viewer/re_viewer/src/web_tools.rs | 9 ++++++++- deny.toml | 2 +- scripts/ci/rust_checks.py | 4 +--- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9994e83c3b1..56096139fc26 100644 --- 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" @@ -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", diff --git a/Cargo.toml b/Cargo.toml index 27229e0bfc02..54d9892cbbdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -575,13 +575,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" } diff --git a/crates/viewer/re_viewer/src/web_tools.rs b/crates/viewer/re_viewer/src/web_tools.rs index 13d6792f2ec3..8e2e1283e8b0 100644 --- a/crates/viewer/re_viewer/src/web_tools.rs +++ b/crates/viewer/re_viewer/src/web_tools.rs @@ -111,7 +111,14 @@ impl EndpointCategory { Self::WebEventListener(uri) } else if uri.starts_with("temp:") { // TODO(#8761): URL prefix - Self::MessageProxy(uri) + #[cfg(feature = "grpc")] + { + Self::MessageProxy(uri) + } + #[cfg(not(feature = "grpc"))] + { + panic!("Required the 'grpc' feature flag to be enabled"); + } } else { // If this is something like `foo.com` we can't know what it is until we connect to it. // We could/should connect and see what it is, but for now we just take a wild guess instead: diff --git a/deny.toml b/deny.toml index 30765b149088..6b310b33aac0 100644 --- a/deny.toml +++ b/deny.toml @@ -80,12 +80,12 @@ allow = [ "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ "ISC", # https://www.tldrlegal.com/license/isc-license - "LicenseRef-UFL-1.0", # See https://github.com/emilk/egui/issues/2321 "MIT-0", # https://choosealicense.com/licenses/mit-0/ "MIT", # https://tldrlegal.com/license/mit-license "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux. "OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html "OpenSSL", # https://www.openssl.org/source/license.html - used on Linux + "Ubuntu-font-1.0", # https://ubuntu.com/legal/font-licence "Unicode-3.0", # https://www.unicode.org/license.txt "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html "Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib) diff --git a/scripts/ci/rust_checks.py b/scripts/ci/rust_checks.py index f31de575c476..2f52a1b9c7ec 100755 --- a/scripts/ci/rust_checks.py +++ b/scripts/ci/rust_checks.py @@ -186,9 +186,7 @@ def cargo_deny(results: list[Result]) -> None: # Note: running just `cargo deny check` without a `--target` can result in # false positives due to https://github.com/EmbarkStudios/cargo-deny/issues/324 # Installing is quite quick if it's already installed. - # - # `cargo-deny` 0.16.2 raises MSRV 1.81.0, we're not there yet. - results.append(run_cargo("install", "--locked cargo-deny@0.16.1")) + results.append(run_cargo("install", "--locked cargo-deny")) results.append(run_cargo("deny", "--all-features --log-level error --target aarch64-apple-darwin check")) results.append(run_cargo("deny", "--all-features --log-level error --target i686-pc-windows-gnu check")) results.append(run_cargo("deny", "--all-features --log-level error --target i686-pc-windows-msvc check"))