Skip to content

muxml: switch to FxHash #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algorithmiker merged 1 commit into from
Feb 6, 2025
Merged

muxml: switch to FxHash #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ clap = { version = "4.5.4", features = ["derive"] }
itertools = "0.14.0"
itoa = "1.0.11"
midly = "0.5.3"
rustc-hash = "2.1.1"
yansi = "1.0.1"

[dev-dependencies]
Expand Down
6 changes: 4 additions & 2 deletions src/backend/muxml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use formatters::{
MUXML_INCOMPLETE_DOC_PRELUDE,
};
use fretboard::get_fretboard_note2;
use rustc_hash::FxBuildHasher;
use std::collections::HashMap;
use std::time::Duration;

Expand Down Expand Up @@ -54,7 +55,8 @@ pub enum Muxml2TabElement {

impl Muxml2TabElement {
fn write_muxml<A: std::fmt::Write>(
&self, parsed: &ParseResult, buf: &mut A, note_properties: &HashMap<u32, NoteProperties>,
&self, parsed: &ParseResult, buf: &mut A,
note_properties: &HashMap<u32, NoteProperties, impl std::hash::BuildHasher>,
) -> std::fmt::Result {
match self {
Muxml2TabElement::Rest(mut x) => {
Expand Down Expand Up @@ -192,7 +194,7 @@ fn gen_muxml2(
debugln!("muxml2: reserved {}", cap);
let mut slur_cnt = 0;
let mut slide_count = 0;
let mut note_properties: HashMap<u32, NoteProperties> = HashMap::new();
let mut note_properties: HashMap<u32, NoteProperties, FxBuildHasher> = HashMap::default();
for measure_idx in 0..number_of_measures {
traceln!("Muxml2: processing measure {}", measure_idx);
let ticks_in_measure = rlen(&parsed.measures[measure_idx].data_range) / 6; // see assumption 2
Expand Down