mirror of
https://github.com/dredozubov/polyrhythmix.git
synced 2024-11-29 07:07:42 +00:00
Warning fixes broke tests, reverting
This commit is contained in:
parent
1d2192d705
commit
a5f5694a78
2 changed files with 8 additions and 3 deletions
|
@ -3,6 +3,7 @@ use std::cmp::Ordering;
|
||||||
use std::cmp::Ordering::*;
|
use std::cmp::Ordering::*;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::iter::Peekable;
|
use std::iter::Peekable;
|
||||||
|
use std::{str::FromStr};
|
||||||
|
|
||||||
use midly::{
|
use midly::{
|
||||||
num::u24, num::u28, num::u4, num::u7, Header, MidiMessage, Smf, TrackEventKind,
|
num::u24, num::u28, num::u4, num::u7, Header, MidiMessage, Smf, TrackEventKind,
|
||||||
|
@ -11,8 +12,11 @@ use midly::{MetaMessage, TrackEvent};
|
||||||
|
|
||||||
use crate::dsl::dsl::{
|
use crate::dsl::dsl::{
|
||||||
BasicLength, Group, GroupOrNote, Groups,
|
BasicLength, Group, GroupOrNote, Groups,
|
||||||
KnownLength, Length, ModdedLength, Note, Times
|
KnownLength, Length, ModdedLength, Note, Times,
|
||||||
|
groups, group_or_delimited_group, flatten_group,
|
||||||
|
EIGHTH, FOURTH, SIXTEENTH
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::midi::time::TimeSignature;
|
use crate::midi::time::TimeSignature;
|
||||||
#[allow(unused_imports)]
|
#[allow(unused_imports)]
|
||||||
use GroupOrNote::*;
|
use GroupOrNote::*;
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
extern crate derive_more;
|
extern crate derive_more;
|
||||||
|
|
||||||
use std::{str::FromStr};
|
use std::{cmp::Ordering, str::FromStr};
|
||||||
|
|
||||||
|
use crate::dsl::dsl::{BasicLength, GroupOrNote, KnownLength, Note, Group, groups, Times, EIGHTH, FOURTH};
|
||||||
|
|
||||||
use crate::dsl::dsl::{BasicLength, GroupOrNote, KnownLength, Note};
|
|
||||||
use BasicLength::*;
|
use BasicLength::*;
|
||||||
#[allow(unused_imports)]
|
#[allow(unused_imports)]
|
||||||
use Note::*;
|
use Note::*;
|
||||||
|
|
Loading…
Reference in a new issue