Skip to content

Commit

Permalink
src: re-export most types to top-level module
Browse files Browse the repository at this point in the history
  • Loading branch information
paveyry committed Sep 5, 2023
1 parent c68b4da commit f5b7197
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 35 deletions.
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -27,9 +27,11 @@ Then you can start creating music.
```rust
use std::error::Error;
use std::fs::File;
use std::result::Result;

use rust_music::{
dynamic::MF, note::*, part::Part, phrase::Phrase, rhythm::CROTCHET, score::*, Instrument,
compute_pitch, dynamic::*, rhythm::*, Accidental, Instrument, Note, NoteName, Part, Phrase,
Score, Tempo,
};

fn main() -> Result<(), Box<dyn Error>> {
Expand Down
6 changes: 3 additions & 3 deletions examples/praeludium_no1_multi_phrase.rs
@@ -1,14 +1,14 @@
use std::fs::File;

use rust_music::dynamic::*;
use rust_music::note::{compute_pitch, Accidental as Acc, Note, NoteName as NN};
use rust_music::num::u7;
use rust_music::part::Part;
use rust_music::phrase::Phrase;
use rust_music::rhythm::*;
use rust_music::score::*;
use rust_music::Instrument;
use rust_music::Part;
use rust_music::Phrase;
use rust_music::Result;
use rust_music::{compute_pitch, Accidental as Acc, Note, NoteName as NN};

fn main() {
let score = praeludium().unwrap();
Expand Down
13 changes: 4 additions & 9 deletions examples/praeludium_no1_organ_piano.rs
@@ -1,14 +1,9 @@
use std::fs::File;

use rust_music::dynamic::*;
use rust_music::note::{compute_pitch, Accidental as Acc, Note, NoteName as NN};
use rust_music::num::u7;
use rust_music::part::Part;
use rust_music::phrase::Phrase;
use rust_music::rhythm::*;
use rust_music::score::*;
use rust_music::Instrument;
use rust_music::Result;
use rust_music::{
compute_pitch, dynamic::*, num::u7, rhythm::*, Accidental as Acc, Instrument, Metadata, Mode,
Note, NoteName as NN, Part, Phrase, Result, Score, Tempo,
};

fn main() {
let score = praeludium().unwrap();
Expand Down
14 changes: 4 additions & 10 deletions examples/praeludium_no1_single_phrase.rs
@@ -1,15 +1,9 @@
use std::fs::File;

use rust_music::chord::Chord;
use rust_music::dynamic::*;
use rust_music::note::{compute_pitch, Accidental as Acc, Note, NoteName as NN};
use rust_music::num::u7;
use rust_music::part::Part;
use rust_music::phrase::Phrase;
use rust_music::rhythm::*;
use rust_music::score::*;
use rust_music::Instrument;
use rust_music::Result;
use rust_music::{
compute_pitch, dynamic::*, num::u7, rhythm::*, Accidental as Acc, Chord, Instrument, Metadata,
Mode, Note, NoteName as NN, Part, Phrase, Result, Score, Tempo,
};

fn main() {
let score = praeludium().unwrap();
Expand Down
4 changes: 3 additions & 1 deletion examples/readme_example.rs
@@ -1,8 +1,10 @@
use std::error::Error;
use std::fs::File;
use std::result::Result;

use rust_music::{
dynamic::MF, note::*, part::Part, phrase::Phrase, rhythm::CROTCHET, score::*, Instrument,
compute_pitch, dynamic::*, rhythm::*, Accidental, Instrument, Note, NoteName, Part, Phrase,
Score, Tempo,
};

fn main() -> Result<(), Box<dyn Error>> {
Expand Down
2 changes: 1 addition & 1 deletion src/chord.rs
@@ -1,5 +1,5 @@
use crate::errors::ChordError;
use crate::note::Note;
use crate::Note;
use crate::Result;

/// Describes a set of notes played simultaneously
Expand Down
13 changes: 9 additions & 4 deletions src/lib.rs
@@ -1,19 +1,24 @@
pub mod chord;
mod chord;
mod constants;
pub mod errors;
mod instrument;
pub mod note;
pub mod part;
pub mod phrase;
mod note;
mod part;
mod phrase;
pub mod score;

pub use crate::errors::Error;

pub type Result<T> = core::result::Result<T, Error>;

pub use chord::Chord;
pub use constants::dynamic;
pub use constants::rhythm;
pub use instrument::Instrument;
pub use note::{compute_pitch, Accidental, Note, NoteName};
pub use part::Part;
pub use phrase::{Phrase, PhraseEntry};
pub use score::{Metadata, Mode, Score, Tempo};

pub use midly;
pub use midly::num;
2 changes: 1 addition & 1 deletion src/part.rs
@@ -1,4 +1,4 @@
use crate::{instrument::Instrument, phrase::Phrase};
use crate::{Instrument, Phrase};

/// Describes a score's part. A `Part` is played by a single
/// instrument and can contain multiple phrases, played sequentially
Expand Down
4 changes: 2 additions & 2 deletions src/phrase.rs
@@ -1,5 +1,5 @@
use crate::chord::Chord;
use crate::note::Note;
use crate::Chord;
use crate::Note;

/// Describes the entries contains in a `Phrase`
#[derive(Clone)]
Expand Down
6 changes: 3 additions & 3 deletions src/score.rs
Expand Up @@ -2,10 +2,10 @@ use std::collections::BTreeMap;

use crate::errors::ScoreError;
use crate::errors::ToMidiConversionError;
use crate::instrument::Instrument;
use crate::num::*;
use crate::part::Part;
use crate::phrase::PhraseEntry;
use crate::Instrument;
use crate::Part;
use crate::PhraseEntry;
use crate::Result;

use crate::midly::{
Expand Down

0 comments on commit f5b7197

Please sign in to comment.