fix lookup table, update nix deps

Author: algorithmiker

flake.lock

@@ -30,7 +30,7 @@
       packages.${system}.default = pkgs.rustPlatform.buildRustPackage {
         pname = "scoreman";
         version = "1.0.0";
-        cargoHash = "sha256-PeWB4zK2G8DiLxRZSLGJWoNh0PACandjYHhjy2zNG4E=";
+        cargoHash = "sha256-z/nCYw3ShSZoJDXchue7a1zmprdvCo/g5r3qRrymJeA=";
         src = ./.;
       };
       devShells.${system}.default = pkgs.mkShell {

flake.nix

@@ -46,4 +46,4 @@ pub fn get_fretboard_note2(string: char, fret: u8) -> Option<MuxmlNote2> {
 /// cache line
 /// Generated by tools/gen_note_lookup.rs
 #[rustfmt::skip]
-const STRING_BASE_NOTES: [Option<NonZeroU8>;256] = [None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(45).unwrap()), Some(NonZeroU8::new(49).unwrap()), None, Some(NonZeroU8::new(50).unwrap()), Some(NonZeroU8::new(40).unwrap()), None, Some(NonZeroU8::new(55).unwrap()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(62).unwrap()), Some(NonZeroU8::new(64).unwrap()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None];
+const STRING_BASE_NOTES: [Option<NonZeroU8>;256] = unsafe {[None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(45).unwrap_unchecked()), Some(NonZeroU8::new(59).unwrap_unchecked()), None, Some(NonZeroU8::new(50).unwrap_unchecked()), Some(NonZeroU8::new(40).unwrap_unchecked()), None, Some(NonZeroU8::new(55).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, Some(NonZeroU8::new(62).unwrap_unchecked()), Some(NonZeroU8::new(64).unwrap_unchecked()), None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None]};

src/backend/muxml/fretboard.rs

@@ -1,17 +1,20 @@
+use std::fmt::Write;
 use std::num::NonZeroU8;
 fn main() {
     let mut lookup = vec![String::from("None"); 256];
     let mut set_lookup = |c: char, value: u8| {
-        lookup[c as usize] = format!("Some(NonZeroU8::new({value}).unwrap())");
+        lookup[c as usize] = format!("Some(NonZeroU8::new({value}).unwrap_unchecked())");
     };
-
+    // octave * 12 + offset in the 12-scale
+    // (so octave 0, C = 0)
     set_lookup('E', 3 * 12 + 4);
     set_lookup('A', 3 * 12 + 9);
     set_lookup('D', 4 * 12 + 2);
     set_lookup('G', 4 * 12 + 7);
-    set_lookup('B', 4 * 12 + 1);
+    set_lookup('B', 4 * 12 + 11);
     set_lookup('d', 5 * 12 + 2);
     set_lookup('e', 5 * 12 + 4);
+
     let mut b = String::from("[");
     for x in &lookup {
         b.push_str(&x.to_string());
@@ -21,7 +24,7 @@ fn main() {
     b.pop();
     b.push(']');
     println!(
-        "#[rustfmt::skip]\nconst STRING_BASE_NOTES: [Option<NonZeroU8>;{}] = {b};",
+        "#[rustfmt::skip]\nconst STRING_BASE_NOTES: [Option<NonZeroU8>;{}] = unsafe {{{b}}};",
         lookup.len()
     );
 }