Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into andreas/indicator-com…
Browse files Browse the repository at this point in the history
…ponent-store-subscription
  • Loading branch information
Wumpf committed Dec 22, 2023
2 parents 7e27f61 + c621d90 commit 43ecf81
Show file tree
Hide file tree
Showing 121 changed files with 5,117 additions and 2,014 deletions.
86 changes: 48 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ indent = "0.1"
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
insta = "1.23"
itertools = "0.11" # updating itertools is blocked on the next egui_tiles update
itertools = "0.12" # updating itertools is blocked on the next egui_tiles update
js-sys = "0.3"
# No lazy_static - use `std::sync::OnceLock` or `once_cell` instead
libc = "0.2"
Expand Down Expand Up @@ -279,3 +279,5 @@ debug = true
# egui_extras = { path = "../../egui/crates/egui_extras" }
# egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
# emath = { path = "../../egui/crates/emath" }

egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "dcdcde10b493683f3e97db47d128683bec0e65b9" } # https://github.com/rerun-io/egui_tiles/pull/40
4 changes: 4 additions & 0 deletions crates/re_log_types/src/path/entity_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ impl EntityPath {
/// Is this equals to, or a descendant of, the given path.
#[inline]
pub fn starts_with(&self, prefix: &EntityPath) -> bool {
if self.hash == prefix.hash {
return true; // optimization!
}

prefix.len() <= self.len() && self.iter().zip(prefix.iter()).all(|(a, b)| a == b)
}

Expand Down
Loading

0 comments on commit 43ecf81

Please sign in to comment.