From a5f5694a784f244d0273758779d3f6e79893ca99 Mon Sep 17 00:00:00 2001
From: Denis Redozubov <denis.redozubov@gmail.com>
Date: Wed, 28 Jun 2023 16:37:18 +0400
Subject: [PATCH] Warning fixes broke tests, reverting

---
 src/midi/core.rs | 6 +++++-
 src/midi/time.rs | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/midi/core.rs b/src/midi/core.rs
index 9f4283b..f16e100 100644
--- a/src/midi/core.rs
+++ b/src/midi/core.rs
@@ -3,6 +3,7 @@ use std::cmp::Ordering;
 use std::cmp::Ordering::*;
 use std::collections::BTreeMap;
 use std::iter::Peekable;
+use std::{str::FromStr};
 
 use midly::{
     num::u24, num::u28, num::u4, num::u7, Header, MidiMessage, Smf, TrackEventKind,
@@ -11,8 +12,11 @@ use midly::{MetaMessage, TrackEvent};
 
 use crate::dsl::dsl::{
     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;
 #[allow(unused_imports)]
 use GroupOrNote::*;
diff --git a/src/midi/time.rs b/src/midi/time.rs
index bf31d03..dd4a1e8 100644
--- a/src/midi/time.rs
+++ b/src/midi/time.rs
@@ -1,8 +1,9 @@
 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::*;
 #[allow(unused_imports)]
 use Note::*;