niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: State ordering use .order()

Browse Source
This commit is contained in:
Jack Wills
2023-11-19 22:52:43 +00:00
parent d200d13c26
commit cd1da2ad96
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app_data/mod.rs
+4 -4
View File
@@ -164,10 +164,10 @@ impl AppData {
match head { match head {
Header::State => match ord { Header::State => match ord {
SortedOrder::Asc => { SortedOrder::Asc => {
a.status.cmp(&b.status).then_with(|| a.name.cmp(&b.name)) a.state.order().cmp(&b.state.order()).then_with(|| a.name.cmp(&b.name))
} }
SortedOrder::Desc => { SortedOrder::Desc => {
b.status.cmp(&a.status).then_with(|| b.name.cmp(&a.name)) b.state.order().cmp(&a.state.order()).then_with(|| b.name.cmp(&a.name))
} }
}, },
Header::Status => match ord { Header::Status => match ord {
@@ -213,8 +213,8 @@ impl AppData {
} }
}, },
Header::Name => match ord { Header::Name => match ord {
SortedOrder::Asc => a.name.cmp(&b.name).then_with(|| a.name.cmp(&b.name)), SortedOrder::Asc => a.name.cmp(&b.name).then_with(|| a.id.cmp(&b.id)),
SortedOrder::Desc => b.name.cmp(&a.name).then_with(|| b.name.cmp(&a.name)), SortedOrder::Desc => b.name.cmp(&a.name).then_with(|| b.id.cmp(&a.id)),
}, },
Header::Rx => match ord { Header::Rx => match ord {
SortedOrder::Asc => a.rx.cmp(&b.rx).then_with(|| a.name.cmp(&b.name)), SortedOrder::Asc => a.rx.cmp(&b.rx).then_with(|| a.name.cmp(&b.name)),