summaryrefslogtreecommitdiffstats
path: root/rsdosedit
diff options
context:
space:
mode:
authorsalmonik <salmonik@tuta.io>2026-08-01 03:47:51 +0200
committersalmonik <salmonik@tuta.io>2026-08-01 03:47:51 +0200
commit7c5603b2fed27be86982665a8b10dcd8f1c5a483 (patch)
treee808380c9411c1847ff12aa2a35c94776b1f5292 /rsdosedit
parentClean up warnings, fix FAT32 multi-cluster dirs, prep for edition 2024 (diff)
downloadrs-dos-7c5603b2fed27be86982665a8b10dcd8f1c5a483.tar.gz
rs-dos-7c5603b2fed27be86982665a8b10dcd8f1c5a483.zip
Bump workspace to edition 2024
- edition = "2024" in the workspace manifest and rsdosedit - extern blocks must be unsafe: interrupts.rs ISR stubs -> unsafe extern "C" - #[no_mangle] -> #[unsafe(no_mangle)] (efi_main, isr_dispatch) - One missed static-mut read in free_list_insert wrapped in an explicit unsafe block (edition 2024 removed the implicit unsafe context inside unsafe fns) - rustfmt reflows for 2024: nested if-lets become let-chains, imports re-sorted, rsdosedit help-screen box rows wrapped No codegen-affecting changes. Validated: cargo check/clippy/fmt clean (host + uefi target), make test-disk PASS, editor round-trip PASS.
Diffstat (limited to '')
-rw-r--r--rsdosedit/Cargo.toml2
-rw-r--r--rsdosedit/src/lib.rs15
2 files changed, 13 insertions, 4 deletions
diff --git a/rsdosedit/Cargo.toml b/rsdosedit/Cargo.toml
index b271eef..92a8123 100644
--- a/rsdosedit/Cargo.toml
+++ b/rsdosedit/Cargo.toml
@@ -1,7 +1,7 @@
1[package] 1[package]
2name = "rsdosedit" 2name = "rsdosedit"
3version = "0.1.0" 3version = "0.1.0"
4edition = "2021" 4edition = "2024"
5 5
6[lints] 6[lints]
7workspace = true 7workspace = true
diff --git a/rsdosedit/src/lib.rs b/rsdosedit/src/lib.rs
index cfb3b0e..8f67514 100644
--- a/rsdosedit/src/lib.rs
+++ b/rsdosedit/src/lib.rs
@@ -191,9 +191,15 @@ impl Editor {
191 191
192 let help_lines = [ 192 let help_lines = [
193 ("", ""), 193 ("", ""),
194 (" \u{2550}", "\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}"), 194 (
195 " \u{2550}",
196 "\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}",
197 ),
195 (" rsedit", " \u{2014} Keybindings"), 198 (" rsedit", " \u{2014} Keybindings"),
196 (" \u{2550}", "\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}"), 199 (
200 " \u{2550}",
201 "\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}\u{2550}",
202 ),
197 ("", ""), 203 ("", ""),
198 (" Arrow keys", " Move cursor"), 204 (" Arrow keys", " Move cursor"),
199 (" ^\u{2190} / ^\u{2192}", " Word backward/forward"), 205 (" ^\u{2190} / ^\u{2192}", " Word backward/forward"),
@@ -208,7 +214,10 @@ impl Editor {
208 (" Tab", " Insert spaces (smart tab)"), 214 (" Tab", " Insert spaces (smart tab)"),
209 (" ^S", " Save file"), 215 (" ^S", " Save file"),
210 (" ^W", " Search forward"), 216 (" ^W", " Search forward"),
211 (" ^X", " Exit (twice to discard changes)"), 217 (
218 " ^X",
219 " Exit (twice to discard changes)",
220 ),
212 (" ^Z", " Suspend editor (job control)"), 221 (" ^Z", " Suspend editor (job control)"),
213 (" ^_", " Undo"), 222 (" ^_", " Undo"),
214 (" ^G", " This help"), 223 (" ^G", " This help"),