Fix clippy lints

Author: AldaronLau

ink/src/lib.rs

@@ -19,22 +19,14 @@
 use scof::{Cursor, Fraction, Marking, Note, Pitch, Scof};
 
 /// This is the entire program context.
+#[derive(Default)]
 pub struct Program {
     /// The save file.
     pub scof: Scof,
     /// Current cursor
     pub cursor: Cursor,
 }
 
-impl Default for Program {
-    fn default() -> Self {
-        Self {
-            scof: Scof::default(),
-            cursor: Cursor::default(),
-        }
-    }
-}
-
 impl Program {
     /// Create a new program.
     pub fn new() -> Self {

scof/src/fraction.rs

@@ -4,7 +4,6 @@
 
 use std::{
     cmp::Ordering,
-    convert::TryInto,
     fmt,
     ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign},
     str::FromStr,
@@ -90,9 +89,9 @@ impl Add for Fraction {
             return other;
         }
 
-        let (self_mul, other_mul, den) = if self.den % other.den == 0 {
+        let (self_mul, other_mul, den) = if self.den.is_multiple_of(other.den) {
             (1, self.den / other.den, self.den)
-        } else if other.den % self.den == 0 {
+        } else if other.den.is_multiple_of(self.den) {
             (other.den / self.den, 1, other.den)
         } else {
             (other.den, self.den, self.den * other.den)
@@ -117,9 +116,9 @@ impl Sub for Fraction {
     type Output = Fraction;
 
     fn sub(self, other: Fraction) -> Self::Output {
-        let (self_mul, other_mul, den) = if self.den % other.den == 0 {
+        let (self_mul, other_mul, den) = if self.den.is_multiple_of(other.den) {
             (1, self.den / other.den, self.den)
-        } else if other.den % self.den == 0 {
+        } else if other.den.is_multiple_of(self.den) {
             (other.den / self.den, 1, other.den)
         } else {
             (other.den, self.den, self.den * other.den)
@@ -200,41 +199,41 @@ impl fmt::Display for Fraction {
 }
 
 pub trait IsZero {
-    fn is_zero(self) -> bool;
+    fn is_zero(&self) -> bool;
 }
 
 impl IsZero for u8 {
-    fn is_zero(self) -> bool {
-        self == 0
+    fn is_zero(&self) -> bool {
+        *self == 0
     }
 }
 
 impl IsZero for u16 {
-    fn is_zero(self) -> bool {
-        self == 0
+    fn is_zero(&self) -> bool {
+        *self == 0
     }
 }
 
 impl IsZero for u32 {
-    fn is_zero(self) -> bool {
-        self == 0
+    fn is_zero(&self) -> bool {
+        *self == 0
     }
 }
 
 impl IsZero for u64 {
-    fn is_zero(self) -> bool {
-        self == 0
+    fn is_zero(&self) -> bool {
+        *self == 0
     }
 }
 
 impl IsZero for u128 {
-    fn is_zero(self) -> bool {
-        self == 0
+    fn is_zero(&self) -> bool {
+        *self == 0
     }
 }
 
 impl IsZero for Fraction {
-    fn is_zero(self) -> bool {
+    fn is_zero(&self) -> bool {
         self.num == 0 && self.den != 0
     }
 }
@@ -353,6 +352,6 @@ mod tests {
         assert!(Fraction::new(50, 25) > Fraction::new(99, 50));
         assert!(Fraction::new(3, 4) > Fraction::new(1, 2));
         assert!(Fraction::new(1, 3) > Fraction::new(1, 4));
-        assert_eq!(false, Fraction::new(0, 3) > Fraction::new(0, 4));
+        assert!(Fraction::new(0, 3) <= Fraction::new(0, 4));
     }
 }

scof/src/lib.rs

@@ -16,9 +16,7 @@
 //     You should have received a copy of the GNU General Public License
 //     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#![allow(clippy::blacklisted_name)] // bar is a useful musical term
-
-use std::{convert::TryInto, str::FromStr};
+use std::str::FromStr;
 
 use devout::{Tag, log};
 use muon_rs as muon;
@@ -172,7 +170,7 @@ impl FromStr for Marking {
     type Err = ();
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Marking::Note(s.parse::<Note>().and_then(Ok)?))
+        Ok(Marking::Note(s.parse::<Note>()?))
     }
 }
 
@@ -198,8 +196,6 @@ pub enum Repeat {
     Ending(u8),
 }
 
-/////////////////////
-////             ////
 /////////////////////
 
 /// A waveform.
@@ -691,7 +687,7 @@ impl Scof {
 
         let b = cursor.marking;
 
-        new_notes.extend(notes.drain(0..b.try_into().unwrap()));
+        new_notes.extend(notes.drain(0..usize::from(b)));
 
         let mut i = 0;
         i = loop {
@@ -790,7 +786,7 @@ impl Scof {
     /// Insert a note after the cursor.
     fn insert_after(&mut self, cursor: Cursor, marking: Marking) -> Option<()> {
         self.chan_notes_mut(cursor.right_unchecked())?
-            .insert((cursor.marking + 1).try_into().unwrap(), marking);
+            .insert(usize::from(cursor.marking + 1), marking);
         Some(())
     }
 }

scof/src/note/articulation.rs

@@ -1,5 +1,3 @@
-//!
-
 use std::{fmt, str::FromStr};
 
 /// An articulation (affects how the note is played).

scof/src/note/mod.rs

@@ -61,7 +61,7 @@
 //! - `@`: harmonic (smaller o)
 //! - `|`: pedal
 
-use std::{convert::TryInto, fmt, str::FromStr};
+use std::{fmt, str::FromStr};
 
 use crate::Fraction;
 
@@ -146,11 +146,7 @@ impl fmt::Display for Note {
 impl Note {
     /// Get the note's visual distance above middle C (C4).
     pub fn visual_distance(&self, i: usize) -> Option<Steps> {
-        if let Some(pitch) = self.pitch.get(i) {
-            Some(pitch.visual_distance())
-        } else {
-            None
-        }
+        self.pitch.get(i).map(|pitch| pitch.visual_distance())
     }
 
     /// Set pitch class and octave.

scof/src/note/pitch.rs

@@ -50,23 +50,14 @@ impl FromStr for PitchName {
 /// A Pitch Accidental.
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum PitchAccidental {
-    ///
     DoubleFlat,
-    ///
     FlatQuarterFlat,
-    ///
     Flat,
-    ///
     QuarterFlat,
-    ///
     Natural,
-    ///
     QuarterSharp,
-    ///
     Sharp,
-    ///
     SharpQuarterSharp,
-    ///
     DoubleSharp,
 }
 
@@ -265,9 +256,7 @@ impl Pitch {
         let steps = self.0.name as i32;
 
         // Calculate total number of steps from middle C.
-        Steps {
-            0: steps + octaves * 7,
-        }
+        Steps(steps + octaves * 7)
     }
 }
 

sfff/src/font.rs

@@ -1,7 +1,4 @@
-use std::{
-    convert::TryInto,
-    io::{Read, Write},
-};
+use std::io::{Read, Write};
 
 use crate::glyph::Glyph;
 
@@ -38,21 +35,15 @@ pub struct SfFontMetadata {
     pub font_name: String,
 
     // Non-glyph components (in thousandths of stave space)
-    ///
     pub stave_line_thickness: i32,
-    ///
     pub stem_thickness: i32,
-    ///
     pub ledger_line_thickness: i32,
-    ///
     pub ledger_line_extension: i32,
     /// Also used for ties
     pub slur_endpoint_thickness: i32,
     /// Also used for ties
     pub slur_midpoint_thickness: i32,
-    ///
     pub barline_thickness: i32,
-    ///
     pub thick_barline_thickness: i32,
     /// Space between two barlines
     pub barlines_space: i32,
@@ -65,7 +56,6 @@ pub struct SfFontMetadata {
     /// Cresc., Dim., hairpin thickness (pedal, octave, ending, lyric melisma,
     /// tuple brackets)
     pub hairpin_thickness: i32,
-    ///
     pub rehearsal_box_thickness: i32,
 
     // Glyph metadata (Notehead & Stem Positions)
@@ -164,7 +154,7 @@ fn read_short_str<T: Read>(reader: &mut T) -> Result<String, ReadError> {
     reader
         .read_exact(&mut buf)
         .map_err(|_| ReadError::UnexpectedEOF)?;
-    Ok(String::from_utf8(buf).map_err(|_| ReadError::InvalidText)?)
+    String::from_utf8(buf).map_err(|_| ReadError::InvalidText)
 }
 
 /// Write a short string (0-255 bytes)

staverator/src/bar.rs

@@ -105,14 +105,14 @@ impl BarElem {
             measure, 0, /* i chan */
             0, /* marking */
         );
-        let reset_cursor = curs.clone();
+        let reset_cursor = curs;
 
         // Make voicings for each stave.
         let mut stave_voicing = vec![];
         let mut stave_cursor = vec![];
         for chan in 0..scof.movement[0].bar[0].chan.len() as u16 {
             curs = reset_cursor.chan(chan);
-            let notes = notator::notate(scof, cursor.clone(), curs.clone());
+            let notes = notator::notate(scof, *cursor, curs);
             stave_voicing.push(notes);
             stave_cursor.push(*cursor == curs);
         }

staverator/src/beaming.rs

@@ -54,18 +54,24 @@ pub enum BeamProp {
     Flag,
 }
 
+/// A voicing that may be beamed or flagged
+type BeamedOrFlaggedVoicing = (BeamProp, u16, f32, (Vec<Pitch>, Steps));
+
+/// A voicing that is part of a beamed group
+type BeamedVoicings = (u16, f32, (Vec<Pitch>, Steps), bool);
+
 /// All of the beams in a measure.
 pub(crate) struct Beams {
     // Duration not notated yet in the measure.
     dur: u16,
     // Notes that may be flagged or beamed.
-    short: VecDeque<(BeamProp, u16, f32, (Vec<Pitch>, Steps))>,
+    short: VecDeque<BeamedOrFlaggedVoicing>,
     // Last was short?
     last_short: bool,
     // Minimum duration within current beam.
     min_dur: u16,
     // Notes in the beamed group.
-    notes: Vec<(u16, f32, (Vec<Pitch>, Steps), bool)>,
+    notes: Vec<BeamedVoicings>,
     // For iterator.
     queued: Option<Short>,
 }

staverator/src/notator.rs

@@ -16,8 +16,6 @@
 //     You should have received a copy of the GNU General Public License
 //     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use std::convert::TryInto;
-
 use scof::{Cursor, Marking, Pitch, Scof};
 
 /// A voicing is the set of notes at one position in a piece
@@ -118,5 +116,5 @@ impl<'a> Iterator for Notator<'a> {
 
 /// Notate one measure
 pub fn notate(scof: &Scof, cursor: Cursor, curs: Cursor) -> Vec<Voicing> {
-    Notator::new(scof, cursor.clone(), curs.clone()).collect()
+    Notator::new(scof, cursor, curs).collect()
 }