Skip to content

Commit aa37baf

Browse files
committed
Update some files now the code is in it's own repo.
* this code originated in the makerpnp repo, here: https://github.com/MakerPnP/makerpnp/commits/master/?since=2025-06-24&until=2025-06-25
1 parent 757bbef commit aa37baf

9 files changed

Lines changed: 77 additions & 48 deletions

File tree

.gitattributes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[attr]rust text eol=auto whitespace=tab-in-indent,trailing-space,tabwidth=4
2+
3+
*.md text=auto
4+
*.toml text=auto
5+
*.rs rust diff=rust
6+
Cargo.lock linguist-generated=false
7+
.gitattributes text=auto
8+
.gitignore text=auto
9+
10+
*.png binary
11+
*.ico binary

.github/workflows/rust.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Rust
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
env:
10+
CARGO_TERM_COLOR: always
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Install libdbus
20+
run: sudo apt-get install -y libdbus-1-3 libdbus-1-dev
21+
- name: Build
22+
run: cargo build --verbose
23+
- name: Run tests
24+
run: cargo test --verbose

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/demos/*/target
2+
/target

.rustfmt.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# run with `cargo +nightly fmt`
2+
#
3+
# every setting in here must be coupled with a reason for the setting
4+
5+
6+
# Suitable for RustRover at 1920x1080 with reasonably sized left and right hand side panels with a 13pt code font
7+
max_width = 120
8+
9+
# it's important to clearly see method chains, and allows RustRover to embed the return type of each chain at the end
10+
# of the line making the code more readable
11+
chain_width = 40
12+
13+
# combine this with 'autocrlf = true' in git config
14+
newline_style = "Native"
15+
16+
# rustrover ide warns about this
17+
use_field_init_shorthand = true
18+
19+
#
20+
# 'nightly' settings
21+
#
22+
23+
# cleaner
24+
group_imports = "StdExternalCrate"
25+
26+
# makes adding new fields harder to follow in diffs.
27+
struct_lit_single_line = false
28+
29+
# reduces nesting
30+
overflow_delimited_expr = true
31+
32+
# better for diffs
33+
trailing_comma = "Vertical"
34+
35+
#
36+
# consider removing the following
37+
#
38+
merge_derives = false

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2024"
88
layout_debugging = []
99

1010
[dependencies]
11-
egui = { workspace = true }
11+
egui = "0.31.1"
1212

1313
[dev-dependencies]
14-
eframe = { workspace = true, features = ["wgpu"] }
14+
eframe = { version = "0.31.1", features = ["wgpu"] }

demos/demo/Cargo.lock

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ name = "accesskit"
2323
version = "0.17.1"
2424
source = "registry+https://github.com/rust-lang/crates.io-index"
2525
checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
26-
dependencies = [
27-
"enumn",
28-
"serde",
29-
]
3026

3127
[[package]]
3228
name = "accesskit_atspi_common"
@@ -129,7 +125,6 @@ dependencies = [
129125
"cfg-if",
130126
"getrandom 0.3.3",
131127
"once_cell",
132-
"serde",
133128
"version_check",
134129
"zerocopy",
135130
]
@@ -796,7 +791,6 @@ checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1"
796791
dependencies = [
797792
"bytemuck",
798793
"emath",
799-
"serde",
800794
]
801795

802796
[[package]]
@@ -849,7 +843,6 @@ dependencies = [
849843
"log",
850844
"nohash-hasher",
851845
"profiling",
852-
"serde",
853846
]
854847

855848
[[package]]
@@ -933,7 +926,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
933926
checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
934927
dependencies = [
935928
"bytemuck",
936-
"serde",
937929
]
938930

939931
[[package]]
@@ -963,17 +955,6 @@ dependencies = [
963955
"syn",
964956
]
965957

966-
[[package]]
967-
name = "enumn"
968-
version = "0.1.14"
969-
source = "registry+https://github.com/rust-lang/crates.io-index"
970-
checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
971-
dependencies = [
972-
"proc-macro2",
973-
"quote",
974-
"syn",
975-
]
976-
977958
[[package]]
978959
name = "epaint"
979960
version = "0.31.1"
@@ -990,7 +971,6 @@ dependencies = [
990971
"nohash-hasher",
991972
"parking_lot",
992973
"profiling",
993-
"serde",
994974
]
995975

996976
[[package]]

demos/demo/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ edition = "2024"
77
egui = "0.31.1"
88
eframe = "0.31.1"
99
egui_vertical_stack = { path = "../.."}
10-
11-
# cargo workaround
12-
[workspace]

demos/simple/Cargo.lock

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ name = "accesskit"
2323
version = "0.17.1"
2424
source = "registry+https://github.com/rust-lang/crates.io-index"
2525
checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
26-
dependencies = [
27-
"enumn",
28-
"serde",
29-
]
3026

3127
[[package]]
3228
name = "accesskit_atspi_common"
@@ -129,7 +125,6 @@ dependencies = [
129125
"cfg-if",
130126
"getrandom 0.3.3",
131127
"once_cell",
132-
"serde",
133128
"version_check",
134129
"zerocopy",
135130
]
@@ -796,7 +791,6 @@ checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1"
796791
dependencies = [
797792
"bytemuck",
798793
"emath",
799-
"serde",
800794
]
801795

802796
[[package]]
@@ -849,7 +843,6 @@ dependencies = [
849843
"log",
850844
"nohash-hasher",
851845
"profiling",
852-
"serde",
853846
]
854847

855848
[[package]]
@@ -933,7 +926,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
933926
checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b"
934927
dependencies = [
935928
"bytemuck",
936-
"serde",
937929
]
938930

939931
[[package]]
@@ -963,17 +955,6 @@ dependencies = [
963955
"syn",
964956
]
965957

966-
[[package]]
967-
name = "enumn"
968-
version = "0.1.14"
969-
source = "registry+https://github.com/rust-lang/crates.io-index"
970-
checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
971-
dependencies = [
972-
"proc-macro2",
973-
"quote",
974-
"syn",
975-
]
976-
977958
[[package]]
978959
name = "epaint"
979960
version = "0.31.1"
@@ -990,7 +971,6 @@ dependencies = [
990971
"nohash-hasher",
991972
"parking_lot",
992973
"profiling",
993-
"serde",
994974
]
995975

996976
[[package]]

demos/simple/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ edition = "2024"
77
egui = "0.31.1"
88
eframe = "0.31.1"
99
egui_vertical_stack = { path = "../.."}
10-
11-
# cargo workaround
12-
[workspace]

0 commit comments

Comments
 (0)