hide parsing related types further inwards

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Upcoming
 
 - Async beatmap parsing
+- Hide various parsing related types further inwards, i.e. `rosu_pp::parse::some_type` instead of `rosu_pp::some_type`
+  - Affected types: `DifficultyPoint`, `HitObject`, `Pos2`, `TimingPoint`, `HitObjectKind`, `PathType`, `HitSound`
 
 # v0.1.1
 

Cargo.toml

@@ -39,4 +39,5 @@ default-features = false
 features = ["io-util"]
 
 [dev-dependencies.tokio]
+version = "1.2"
 features = ["fs", "rt-multi-thread"]

src/control_point_iter.rs

@@ -1,6 +1,9 @@
 #![cfg(any(feature = "osu", feature = "fruits"))]
 
-use crate::{Beatmap, DifficultyPoint, TimingPoint};
+use crate::{
+    parse::{DifficultyPoint, TimingPoint},
+    Beatmap,
+};
 
 use std::slice::Iter;
 
@@ -85,7 +88,10 @@ impl<'p> Iterator for ControlPointIter<'p> {
 
 #[cfg(test)]
 mod test {
-    use crate::{Beatmap, ControlPoint, ControlPointIter, DifficultyPoint, TimingPoint};
+    use crate::{
+        parse::{DifficultyPoint, TimingPoint},
+        Beatmap, ControlPoint, ControlPointIter,
+    };
 
     #[test]
     fn control_point_iter() {

src/curve.rs

@@ -3,7 +3,7 @@
     all(feature = "osu", not(feature = "no_sliders_no_leniency"))
 ))]
 
-use crate::{math_util, Pos2};
+use crate::{math_util, parse::Pos2};
 
 const SLIDER_QUALITY: f32 = 50.0;
 

src/fruits/catch_object.rs

@@ -1,4 +1,4 @@
-use crate::Pos2;
+use crate::parse::Pos2;
 
 const PLAYFIELD_WIDTH: f32 = 512.0;
 const BASE_SPEED: f32 = 1.0;

src/fruits/mod.rs

@@ -12,7 +12,11 @@ use movement::Movement;
 pub use pp::*;
 use slider_state::SliderState;
 
-use crate::{curve::Curve, Beatmap, HitObjectKind, Mods, PathType, Pos2, StarResult, Strains};
+use crate::{
+    curve::Curve,
+    parse::{HitObjectKind, PathType, Pos2},
+    Beatmap, Mods, StarResult, Strains,
+};
 
 use std::convert::identity;
 

src/fruits/slider_state.rs

@@ -44,7 +44,10 @@ impl<'p> SliderState<'p> {
 
 #[cfg(test)]
 mod test {
-    use crate::{Beatmap, DifficultyPoint, TimingPoint};
+    use crate::{
+        parse::{DifficultyPoint, TimingPoint},
+        Beatmap,
+    };
 
     use super::SliderState;
 

src/lib.rs

@@ -150,7 +150,7 @@ pub mod osu;
 #[cfg_attr(docsrs, doc(cfg(feature = "taiko")))]
 pub mod taiko;
 
-mod parse;
+pub mod parse;
 
 mod pp;
 pub use pp::{AnyPP, AttributeProvider};
@@ -178,10 +178,7 @@ pub use osu::OsuPP;
 pub use taiko::TaikoPP;
 
 pub use mods::Mods;
-pub use parse::{
-    Beatmap, BeatmapAttributes, DifficultyPoint, GameMode, HitObject, HitObjectKind, HitSound,
-    ParseError, ParseResult, PathType, Pos2, TimingPoint,
-};
+pub use parse::{Beatmap, BeatmapAttributes, GameMode, ParseError, ParseResult};
 
 pub trait BeatmapExt {
     /// Calculate the stars and other attributes of a beatmap which are required for pp calculation.

src/mania/mod.rs

@@ -6,7 +6,7 @@ mod strain;
 pub use pp::*;
 use strain::Strain;
 
-use crate::{Beatmap, GameMode, HitObject, Mods, StarResult, Strains};
+use crate::{parse::HitObject, Beatmap, GameMode, Mods, StarResult, Strains};
 
 const SECTION_LEN: f32 = 400.0;
 const STAR_SCALING_FACTOR: f32 = 0.018;

src/math_util.rs

@@ -3,7 +3,7 @@
     all(feature = "osu", not(feature = "no_sliders_no_leniency"))
 ))]
 
-use crate::Pos2;
+use crate::parse::Pos2;
 
 #[inline]
 pub(crate) fn cpn(mut p: i32, n: i32) -> f32 {

src/osu/versions/all_included/mod.rs

@@ -5,7 +5,7 @@
 #![cfg(feature = "all_included")]
 
 use super::super::DifficultyAttributes;
-use crate::Pos2;
+use crate::parse::Pos2;
 
 mod difficulty_object;
 mod osu_object;

src/osu/versions/all_included/osu_object.rs

@@ -1,7 +1,11 @@
 use super::super::super::DifficultyAttributes;
 use super::slider_state::SliderState;
 
-use crate::{curve::Curve, Beatmap, HitObject, HitObjectKind, PathType, Pos2};
+use crate::{
+    curve::Curve,
+    parse::{HitObject, HitObjectKind, PathType, Pos2},
+    Beatmap,
+};
 
 const LEGACY_LAST_TICK_OFFSET: f32 = 36.0;
 

src/osu/versions/all_included/slider_state.rs

@@ -44,7 +44,10 @@ impl<'p> SliderState<'p> {
 
 #[cfg(test)]
 mod test {
-    use crate::{Beatmap, DifficultyPoint, TimingPoint};
+    use crate::{
+        parse::{DifficultyPoint, TimingPoint},
+        Beatmap,
+    };
 
     use super::SliderState;
 

src/osu/versions/no_leniency/osu_object.rs

@@ -1,7 +1,11 @@
 use super::super::super::DifficultyAttributes;
 use super::slider_state::SliderState;
 
-use crate::{curve::Curve, Beatmap, HitObject, HitObjectKind, PathType, Pos2};
+use crate::{
+    curve::Curve,
+    parse::{HitObject, HitObjectKind, PathType, Pos2},
+    Beatmap,
+};
 
 const LEGACY_LAST_TICK_OFFSET: f32 = 36.0;
 

src/osu/versions/no_leniency/slider_state.rs

@@ -44,7 +44,10 @@ impl<'p> SliderState<'p> {
 
 #[cfg(test)]
 mod test {
-    use crate::{Beatmap, DifficultyPoint, TimingPoint};
+    use crate::{
+        parse::{DifficultyPoint, TimingPoint},
+        Beatmap,
+    };
 
     use super::SliderState;
 

src/osu/versions/no_sliders_no_leniency/difficulty_object.rs

@@ -1,4 +1,4 @@
-use crate::HitObject;
+use crate::parse::HitObject;
 
 use std::borrow::Cow;
 

src/osu/versions/no_sliders_no_leniency/mod.rs

@@ -16,7 +16,10 @@ use skill::Skill;
 use skill_kind::SkillKind;
 use slider_state::SliderState;
 
-use crate::{Beatmap, HitObject, HitObjectKind, Mods, StarResult, Strains};
+use crate::{
+    parse::{HitObject, HitObjectKind},
+    Beatmap, Mods, StarResult, Strains,
+};
 
 use std::borrow::Cow;
 

src/taiko/difficulty_object.rs

@@ -1,5 +1,5 @@
 use super::{closest_rhythm, HitObjectRhythm};
-use crate::HitObject;
+use crate::parse::HitObject;
 
 #[derive(Clone, Debug)]
 pub(crate) struct DifficultyObject<'o> {

src/taiko/hitobject_rhythm.rs

@@ -1,4 +1,4 @@
-use crate::HitObject;
+use crate::parse::HitObject;
 
 use std::cmp::Ordering;
 

src/taiko/rim.rs

@@ -1,4 +1,4 @@
-use crate::{HitObject, HitSound};
+use crate::parse::{HitObject, HitSound};
 
 pub(crate) trait Rim {
     fn is_rim(&self) -> bool;

src/taiko/stamina_cheese.rs

@@ -1,6 +1,6 @@
 use super::{LimitedQueue, Rim};
 
-use crate::{Beatmap, HitObject};
+use crate::{parse::HitObject, Beatmap};
 
 const ROLL_MIN_REPETITIONS: usize = 12;
 const TL_MIN_REPETITIONS: isize = 16;