misc

Author: algorithmiker

flake.nix

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

src/backend/fixup/mod.rs

@@ -1,4 +1,4 @@
-use std::time::{Duration, Instant};
+use std::time::Instant;
 
 use clap::ValueEnum;
 use tracing::trace;
@@ -12,7 +12,7 @@ use crate::{
         },
         Backend,
     },
-    parser::parser::parse,
+    parser::parse,
     time,
 };
 
@@ -71,7 +71,7 @@ impl Backend for FixupBackend {
         let mut diagnostics = vec![];
         // TODO: figure out a way not to clone these
         let mut parser_input = parser_input.to_owned();
-        let mut parse_time = Duration::from_secs(0);
+        let mut parse_time;
         let fixup_start = Instant::now();
         let mut location_tracker = LocationTracker::new();
         loop {

src/backend/midi/mod.rs

@@ -7,9 +7,11 @@ use midly::{
 use tracing::trace;
 
 use super::{Backend, BackendResult};
-use crate::parser::parser::{parse, ParseResult};
-use crate::parser::tab_element::TabElement;
-use crate::parser::tab_element::TabElement::Fret;
+use crate::parser::{
+    parse,
+    tab_element::TabElement::{self, Fret},
+    ParseResult,
+};
 use crate::time;
 
 const BPM: u32 = 80;

src/backend/muxml/formatters.rs

@@ -44,7 +44,7 @@ pub fn write_muxml2_note(
     let mut octave_buf = itoa::Buffer::new();
     buf.write_str(octave_buf.format(octave))?;
     buf.write_str(
-        r#"<octave>
+        r#"</octave>
 </pitch>
 <duration>1</duration>
 <type>eighth</type>

src/backend/muxml/mod.rs

@@ -4,9 +4,9 @@ pub mod fretboard;
 mod muxml2_tests;
 pub mod settings;
 use crate::backend::errors::backend_error::BackendError;
-use crate::parser::parser;
-use crate::parser::parser::{source_location_from_stream, ParseResult};
+use crate::parser;
 use crate::parser::tab_element::TabElement;
+use crate::parser::{source_location_from_stream, ParseResult};
 use crate::{
     backend::{Backend, BackendResult},
     rlen, time,

src/backend/muxml/muxml2_tests.rs

@@ -3,7 +3,6 @@ use crate::backend::{
     muxml::{settings::Settings, MuxmlBackend},
     Backend,
 };
-use crate::parser::parser::{parse, source_location_from_stream};
 use itertools::Itertools;
 
 #[test]

src/parser/mod.rs

@@ -1,4 +1,5 @@
-pub mod parser;
+mod parser;
+pub use parser::*;
 #[cfg(test)]
 mod parser_tests;
 pub(crate) mod tab_element;