Skip to content

Commit 88aacdd

Browse files
Wumpflucasmerlin
Wumpf
and
lucasmerlin
authored
Update to egui 0.31.0 (#72)
Co-authored-by: lucasmerlin <[email protected]>
1 parent 2998e13 commit 88aacdd

14 files changed

+68
-81
lines changed

‎.github/workflows/rust.yml

+8-32
Original file line numberDiff line numberDiff line change
@@ -37,49 +37,28 @@ jobs:
3737
uses: Swatinem/rust-cache@v2
3838

3939
- name: Rustfmt
40-
uses: actions-rs/cargo@v1
41-
with:
42-
command: fmt
43-
args: --all -- --check
40+
run: cargo fmt --all -- --check
4441

4542
- name: Lint vertical spacing
4643
run: ./scripts/lint.py
4744

4845
- name: check --all-features
49-
uses: actions-rs/cargo@v1
50-
with:
51-
command: check
52-
args: --all-features --all-targets
46+
run: cargo check --all-features --all-targets
5347

5448
- name: check default features
55-
uses: actions-rs/cargo@v1
56-
with:
57-
command: check
58-
args: --all-targets
49+
run: cargo check --all-targets
5950

6051
- name: check --no-default-features
61-
uses: actions-rs/cargo@v1
62-
with:
63-
command: check
64-
args: --no-default-features --lib --all-targets
52+
run: cargo check --no-default-features --lib --all-targets
6553

6654
- name: cargo doc --lib
67-
uses: actions-rs/cargo@v1
68-
with:
69-
command: doc
70-
args: --lib --no-deps --all-features
55+
run: cargo doc --lib --no-deps --all-features
7156

7257
- name: cargo doc --document-private-items
73-
uses: actions-rs/cargo@v1
74-
with:
75-
command: doc
76-
args: --document-private-items --no-deps --all-features
58+
run: cargo doc --document-private-items --no-deps --all-features
7759

7860
- name: Clippy
79-
uses: actions-rs/cargo@v1
80-
with:
81-
command: clippy
82-
args: --all-targets --all-features -- -D warnings
61+
run: cargo clippy --all-targets --all-features -- -D warnings
8362

8463
# ---------------------------------------------------------------------------
8564

@@ -100,10 +79,7 @@ jobs:
10079
uses: Swatinem/rust-cache@v2
10180

10281
- name: Check wasm32
103-
uses: actions-rs/cargo@v1
104-
with:
105-
command: check
106-
args: --target wasm32-unknown-unknown --lib
82+
run: cargo check --target wasm32-unknown-unknown --lib
10783

10884
- name: Clippy wasm32
10985
env:

‎Cargo.lock

+31-21
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
747747
checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
748748
dependencies = [
749749
"lazy_static",
750-
"windows-sys 0.48.0",
750+
"windows-sys 0.59.0",
751751
]
752752

753753
[[package]]
@@ -974,8 +974,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
974974

975975
[[package]]
976976
name = "ecolor"
977-
version = "0.30.0"
978-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
977+
version = "0.31.0"
978+
source = "registry+https://github.com/rust-lang/crates.io-index"
979+
checksum = "878e9005799dd739e5d5d89ff7480491c12d0af571d44399bcaefa1ee172dd76"
979980
dependencies = [
980981
"bytemuck",
981982
"emath",
@@ -984,8 +985,9 @@ dependencies = [
984985

985986
[[package]]
986987
name = "eframe"
987-
version = "0.30.0"
988-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
988+
version = "0.31.0"
989+
source = "registry+https://github.com/rust-lang/crates.io-index"
990+
checksum = "eba4c50d905804fe9ec4e159fde06b9d38f9440228617ab64a03d7a2091ece63"
989991
dependencies = [
990992
"ahash",
991993
"bytemuck",
@@ -1024,8 +1026,9 @@ dependencies = [
10241026

10251027
[[package]]
10261028
name = "egui"
1027-
version = "0.30.0"
1028-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1029+
version = "0.31.0"
1030+
source = "registry+https://github.com/rust-lang/crates.io-index"
1031+
checksum = "7d2768eaa6d5c80a6e2a008da1f0e062dff3c83eb2b28605ea2d0732d46e74d6"
10291032
dependencies = [
10301033
"accesskit",
10311034
"ahash",
@@ -1041,8 +1044,9 @@ dependencies = [
10411044

10421045
[[package]]
10431046
name = "egui-wgpu"
1044-
version = "0.30.0"
1045-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1047+
version = "0.31.0"
1048+
source = "registry+https://github.com/rust-lang/crates.io-index"
1049+
checksum = "6d8151704bcef6271bec1806c51544d70e79ef20e8616e5eac01facfd9c8c54a"
10461050
dependencies = [
10471051
"ahash",
10481052
"bytemuck",
@@ -1060,8 +1064,9 @@ dependencies = [
10601064

10611065
[[package]]
10621066
name = "egui-winit"
1063-
version = "0.30.0"
1064-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1067+
version = "0.31.0"
1068+
source = "registry+https://github.com/rust-lang/crates.io-index"
1069+
checksum = "ace791b367c1f63e6044aef2f3834904509d1d1a6912fd23ebf3f6a9af92cd84"
10651070
dependencies = [
10661071
"accesskit_winit",
10671072
"ahash",
@@ -1080,8 +1085,9 @@ dependencies = [
10801085

10811086
[[package]]
10821087
name = "egui_glow"
1083-
version = "0.30.0"
1084-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1088+
version = "0.31.0"
1089+
source = "registry+https://github.com/rust-lang/crates.io-index"
1090+
checksum = "9a53e2374a964c3c793cb0b8ead81bca631f24974bc0b747d1a5622f4e39fdd0"
10851091
dependencies = [
10861092
"ahash",
10871093
"bytemuck",
@@ -1097,8 +1103,9 @@ dependencies = [
10971103

10981104
[[package]]
10991105
name = "egui_kittest"
1100-
version = "0.30.0"
1101-
source = "git+https://github.com/emilk/egui?branch=master#99369666eea587f98dc458347e0b9daa6ac99c99"
1106+
version = "0.31.0"
1107+
source = "registry+https://github.com/rust-lang/crates.io-index"
1108+
checksum = "e4a9133e9f6601f7c74edc78dd46b24034bbcf1b99f1bf268ef7b65cf09560ab"
11021109
dependencies = [
11031110
"dify",
11041111
"eframe",
@@ -1129,8 +1136,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
11291136

11301137
[[package]]
11311138
name = "emath"
1132-
version = "0.30.0"
1133-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1139+
version = "0.31.0"
1140+
source = "registry+https://github.com/rust-lang/crates.io-index"
1141+
checksum = "55b7b6be5ad1d247f11738b0e4699d9c20005ed366f2c29f5ec1f8e1de180bc2"
11341142
dependencies = [
11351143
"bytemuck",
11361144
"serde",
@@ -1198,8 +1206,9 @@ dependencies = [
11981206

11991207
[[package]]
12001208
name = "epaint"
1201-
version = "0.30.0"
1202-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1209+
version = "0.31.0"
1210+
source = "registry+https://github.com/rust-lang/crates.io-index"
1211+
checksum = "275b665a7b9611d8317485187e5458750850f9e64604d3c58434bb3fc1d22915"
12031212
dependencies = [
12041213
"ab_glyph",
12051214
"ahash",
@@ -1216,8 +1225,9 @@ dependencies = [
12161225

12171226
[[package]]
12181227
name = "epaint_default_fonts"
1219-
version = "0.30.0"
1220-
source = "git+https://github.com/emilk/egui?branch=master#23ed49334e77342da5bf5c7c67b05e78eb510c1b"
1228+
version = "0.31.0"
1229+
source = "registry+https://github.com/rust-lang/crates.io-index"
1230+
checksum = "9343d356d7cac894dacafc161b4654e0881301097bdf32a122ed503d97cb94b6"
12211231

12221232
[[package]]
12231233
name = "equivalent"

‎Cargo.toml

+8-7
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ ahash = { version = "0.8.11", default-features = false, features = [
2626
"std",
2727
] }
2828
document-features = "0.2.10"
29-
eframe = { version = "0.30.0", default-features = false }
30-
egui = { version = "0.30.0", default-features = false }
31-
emath = { version = "0.30.0", default-features = false }
29+
eframe = { version = "0.31.0", default-features = false }
30+
egui = { version = "0.31.0", default-features = false }
31+
egui_kittest = { version = "0.31.0", default-features = false }
32+
emath = { version = "0.31.0", default-features = false }
3233
env_logger = { version = "0.11.6", default-features = false, features = [
3334
"auto-color",
3435
"humantime",
@@ -42,10 +43,10 @@ web-sys = "0.3.70"
4243

4344
[patch.crates-io]
4445
# When we want to use the bleeding edge version of egui and eframe:
45-
eframe = { git = "https://github.com/emilk/egui", branch = "master" }
46-
egui = { git = "https://github.com/emilk/egui", branch = "master" }
47-
egui_kittest = { git = "https://github.com/emilk/egui", branch = "master" }
48-
emath = { git = "https://github.com/emilk/egui", branch = "master" }
46+
# egui = { git = "https://github.com/emilk/egui", branch = "master" }
47+
# egui_kittest = { git = "https://github.com/emilk/egui", branch = "master" }
48+
# eframe = { git = "https://github.com/emilk/egui", branch = "master" }
49+
# emath = { git = "https://github.com/emilk/egui", branch = "master" }
4950

5051
# If you fork https://github.com/emilk/egui you can test with:
5152
# eframe = { path = "../egui/crates/eframe" }

‎demo/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ wasm-bindgen-futures.workspace = true
3434
web-sys.workspace = true # to access the DOM (to hide the loading text)
3535

3636
[dev-dependencies]
37-
egui_kittest = { version = "0.30.0", features = ["snapshot", "wgpu", "eframe"] }
37+
egui_kittest = { workspace = true, features = ["snapshot", "wgpu", "eframe"] }

‎demo/tests/snapshots/demos/Charts.png

+2-2
Loading

‎demo/tests/snapshots/demos/Interaction.png

+2-2
Loading

‎demo/tests/snapshots/demos/Items.png

+2-2
Loading

‎demo/tests/snapshots/demos/Legend.png

+2-2
Loading

‎demo/tests/snapshots/demos/Lines.png

+2-2
Loading

‎demo/tests/snapshots/demos/Linked Axes.png

+2-2
Loading

‎demo/tests/snapshots/demos/Markers.png

+2-2
Loading

‎demo/tests/snapshots/light_mode.png

+2-2
Loading

‎demo/tests/snapshots/scale_0.50.png

+2-2
Loading

‎demo/tests/snapshots/scale_1.00.png

+2-2
Loading

0 commit comments

Comments
 (0)