Update to latest egui master

rerun-io · Jan 23, 2025 · 80ab908 · 80ab908
1 parent 28b349d
commit 80ab908
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 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#6680e9c079b85c27bbd16873c8b92495de8de320"
 
 [[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
@@ -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" }