mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-22 10:31:37 +01:00
Merge storytold next into memo-audit-fix
next's egui pin (6525c87923, storytold/egui#53 on top of the branch's 1a44fd11cd) replaces the branch's; the lockfile keeps the branch's typeid and craft-ui-contract dependencies. A replay keeps passing its shift: next's in-place replay is the branch's RecordShift::none case.
This commit is contained in:
commit
ec70bb0ff0
3 files changed
+29
-29
No files matched your search
Generated
+14
-14
@@ -5422,7 +5422,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "ecolor"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"emath",
|
||||
@@ -5478,7 +5478,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -5513,7 +5513,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"ahash",
|
||||
@@ -5532,7 +5532,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui-wgpu"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -5551,7 +5551,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui-winit"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"block2 0.6.2",
|
||||
"bytemuck",
|
||||
@@ -5571,7 +5571,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui_glow"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"egui",
|
||||
@@ -5584,7 +5584,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "egui_kittest"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"eframe",
|
||||
"egui",
|
||||
@@ -5661,7 +5661,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "emath"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
@@ -5734,7 +5734,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"bytemuck",
|
||||
@@ -5760,7 +5760,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "epaint_default_fonts"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
|
||||
[[package]]
|
||||
name = "equator"
|
||||
@@ -15095,19 +15095,19 @@ dependencies = [
|
||||
[[patch.unused]]
|
||||
name = "egui_demo_lib"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_extras"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_inspection"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
|
||||
[[patch.unused]]
|
||||
name = "egui_system_font_provider"
|
||||
version = "0.37.0"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=1a44fd11cdb352d564f2d6ca98d6895dee88d07e#1a44fd11cdb352d564f2d6ca98d6895dee88d07e"
|
||||
source = "git+https://github.com/storytold/egui.git?rev=6525c87923ca47465aac244460fe4b1139349060#6525c87923ca47465aac244460fe4b1139349060"
|
||||
+14
-14
@@ -306,20 +306,20 @@ hayro-jbig2 = { path = "vendor/hayro-jbig2" }
|
||||
hayro-cmap = { path = "vendor/hayro-cmap" }
|
||||
hayro-postscript = { path = "vendor/hayro-postscript" }
|
||||
linesweeper = { path = "vendor/linesweeper" }
|
||||
ecolor = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
emath = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
epaint = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_extras = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
eframe = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e" }
|
||||
ecolor = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
emath = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
epaint = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
eframe = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6525c87923ca47465aac244460fe4b1139349060" }
|
||||
winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
|
||||
|
||||
# symphonia's FLAC decoder restores LPC samples as `residual + (prediction as i32)`. In a valid
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/// The egui fork the library is built and tested with. Apps patch egui to exactly this.
|
||||
pub const GIT: &str = "https://github.com/storytold/egui.git";
|
||||
/// The commit of [`GIT`].
|
||||
pub const REV: &str = "1a44fd11cdb352d564f2d6ca98d6895dee88d07e";
|
||||
pub const REV: &str = "6525c87923ca47465aac244460fe4b1139349060";
|
||||
|
||||
/// The packages the workspace patches to the fork (the `[patch.crates-io]` entries that name [`GIT`]).
|
||||
pub const PACKAGES: &[&str] = &[
|
||||
|
||||
Reference in new issue
Block a user