Change function names

src/commands/freq.rs

@@ -2,7 +2,9 @@ use async_trait::async_trait;
 
 use crate::{
     cli::Command,
-    convert::{frequency_to_midi_note, midi_note_number_to_frequency, midi_note_number_to_music_note},
+    convert::{
+        convert_frequency_to_midi_note, convert_midi_note_number_to_frequency, convert_midi_note_number_to_music_note,
+    },
     error::FNoteResult,
     parse::try_frequency_from_str,
 };
@@ -18,10 +20,10 @@ pub struct FreqCommand {
 #[async_trait]
 impl Command for FreqCommand {
     async fn run(&self) -> FNoteResult<()> {
-        let midi_note_number = frequency_to_midi_note(self.frequency).unwrap();
-        let music_note = midi_note_number_to_music_note(midi_note_number).unwrap();
+        let midi_note_number = convert_frequency_to_midi_note(self.frequency).unwrap();
+        let music_note = convert_midi_note_number_to_music_note(midi_note_number).unwrap();
 
-        let frequency = midi_note_number_to_frequency(midi_note_number);
+        let frequency = convert_midi_note_number_to_frequency(midi_note_number);
         let difference = ((self.frequency - frequency) * 100.0).round() / 100.0;
         let sign = if difference >= 0.0 { "+" } else { "-" };
         let formatted_difference = if difference == 0.0 {

src/commands/midi.rs

@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::{
     cli::Command,
-    convert::{midi_note_number_to_frequency, midi_note_number_to_music_note},
+    convert::{convert_midi_note_number_to_frequency, convert_midi_note_number_to_music_note},
     error::FNoteResult,
     parse::try_midi_note_number_from_str,
 };
@@ -21,9 +21,12 @@ impl Command for MidiCommand {
         println!("MIDI: {}", self.midi_note_number);
         println!(
             "Note: {}",
-            midi_note_number_to_music_note(self.midi_note_number).unwrap()
+            convert_midi_note_number_to_music_note(self.midi_note_number).unwrap()
+        );
+        println!(
+            "Frequency: {}Hz",
+            convert_midi_note_number_to_frequency(self.midi_note_number)
         );
-        println!("Frequency: {}Hz", midi_note_number_to_frequency(self.midi_note_number));
 
         Ok(())
     }

src/commands/note.rs

@@ -2,7 +2,7 @@ use async_trait::async_trait;
 
 use crate::{
     cli::Command,
-    convert::{midi_note_number_to_frequency, music_note_to_midi_note_number},
+    convert::{convert_midi_note_number_to_frequency, convert_music_note_to_midi_note_number},
     error::FNoteResult,
     parse::try_music_note_from_str,
 };
@@ -18,8 +18,8 @@ pub struct NoteCommand {
 #[async_trait]
 impl Command for NoteCommand {
     async fn run(&self) -> FNoteResult<()> {
-        let midi_note_number = music_note_to_midi_note_number(self.music_note.as_str())?;
-        let frequency = midi_note_number_to_frequency(midi_note_number);
+        let midi_note_number = convert_music_note_to_midi_note_number(self.music_note.as_str())?;
+        let frequency = convert_midi_note_number_to_frequency(midi_note_number);
 
         println!("Note: {}", self.music_note);
         println!("MIDI: {}", midi_note_number);

src/convert.rs

@@ -1,7 +1,7 @@
 use crate::error::{FNoteError, FNoteResult};
 
 /// Converts a frequency to the nearest MIDI note number.
-pub(crate) fn frequency_to_midi_note(frequency: f32) -> Option<u8> {
+pub(crate) fn convert_frequency_to_midi_note(frequency: f32) -> Option<u8> {
     let midi_note = 69.0 + 12.0 * (frequency / 440.0).log2();
     if (0..=127).contains(&(midi_note.round() as i32)) {
         Some(midi_note.round() as u8)
@@ -11,13 +11,13 @@ pub(crate) fn frequency_to_midi_note(frequency: f32) -> Option<u8> {
 }
 
 /// Converts a MIDI note number to a frequency (Hz).
-pub(crate) fn midi_note_number_to_frequency(midi_note_number: u8) -> f32 {
+pub(crate) fn convert_midi_note_number_to_frequency(midi_note_number: u8) -> f32 {
     let frequency = 440.0 * 2.0f32.powf((midi_note_number as f32 - 69.0) / 12.0);
     (frequency * 100.0).round() / 100.0
 }
 
 /// Converts a MIDI note number to a music note.
-pub(crate) fn midi_note_number_to_music_note(midi_note_number: u8) -> Option<String> {
+pub(crate) fn convert_midi_note_number_to_music_note(midi_note_number: u8) -> Option<String> {
     let semitone_to_note = ["C", "C#", "D", "Eb", "E", "F", "F#", "G", "Ab", "A", "Bb", "B"];
 
     let octave = (midi_note_number / 12) as i8 - 1;
@@ -28,7 +28,7 @@ pub(crate) fn midi_note_number_to_music_note(midi_note_number: u8) -> Option<Str
 }
 
 /// Converts a music note to a MIDI note number.
-pub(crate) fn music_note_to_midi_note_number(music_note: &str) -> FNoteResult<u8> {
+pub(crate) fn convert_music_note_to_midi_note_number(music_note: &str) -> FNoteResult<u8> {
     let note_to_semitone = [
         ("Cb", -1), // -1 instead of 11 because Cb = B, meaning decrement octave by 1
         ("C", 0),