refactor: Move bms part in a folder like bmson

src/bms.rs

@@ -0,0 +1,35 @@
+//! The parser module of BMS(.bms/.bme/.bml/.pms) file.
+
+pub mod lex;
+pub mod parse;
+pub mod time;
+
+use thiserror::Error;
+
+use self::{lex::LexError, parse::ParseError};
+
+/// An error occurred when parsing the BMS format file.
+#[non_exhaustive]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Error)]
+pub enum BmsError {
+    /// An error comes from lexical analyzer.
+    #[error("lex error: {0}")]
+    LexError(LexError),
+    /// An error comes from syntax parser.
+    #[error("parse error: {0}")]
+    ParseError(ParseError),
+}
+
+impl From<LexError> for BmsError {
+    fn from(e: LexError) -> Self {
+        Self::LexError(e)
+    }
+}
+impl From<ParseError> for BmsError {
+    fn from(e: ParseError) -> Self {
+        Self::ParseError(e)
+    }
+}
+
+/// A custom result type for bms-rs.
+pub type Result<T> = std::result::Result<T, BmsError>;

src/parse/notes.rs → src/bms/parse/notes.rs

@@ -328,13 +328,12 @@ impl Notes {
 
     /// Removes the latest note from the notes.
     pub fn remove_latest_note(&mut self, id: ObjId) -> Option<Obj> {
-        self.objs.entry(id).or_default().pop().map(|removed| {
+        self.objs.entry(id).or_default().pop().inspect(|removed| {
             self.ids_by_key
                 .get_mut(&removed.key)
                 .unwrap()
                 .remove(&removed.offset)
                 .unwrap();
-            removed
         })
     }
 

src/lib.rs

@@ -76,38 +76,8 @@
 #![deny(rustdoc::broken_intra_doc_links)]
 #![cfg_attr(feature = "nightly", feature(doc_cfg))]
 
+pub mod bms;
 #[cfg(feature = "bmson")]
 pub mod bmson;
-pub mod lex;
-pub mod parse;
-pub mod time;
 
-use thiserror::Error;
-
-use self::{lex::LexError, parse::ParseError};
-
-/// An error occurred when parsing the BMS format file.
-#[non_exhaustive]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Error)]
-pub enum BmsError {
-    /// An error comes from lexical analyzer.
-    #[error("lex error: {0}")]
-    LexError(LexError),
-    /// An error comes from syntax parser.
-    #[error("parse error: {0}")]
-    ParseError(ParseError),
-}
-
-impl From<LexError> for BmsError {
-    fn from(e: LexError) -> Self {
-        Self::LexError(e)
-    }
-}
-impl From<ParseError> for BmsError {
-    fn from(e: ParseError) -> Self {
-        Self::ParseError(e)
-    }
-}
-
-/// A custom result type for bms-rs.
-pub type Result<T> = std::result::Result<T, BmsError>;
+pub use bms::{lex, parse, time};