simplify the semantic module

Author: rizsotto

bear/src/output/writers.rs

@@ -2,7 +2,6 @@
 
 use super::formats::{FileFormat, JsonCompilationDatabase, JsonSemanticDatabase};
 use crate::semantic::clang::{DuplicateEntryFilter, Entry};
-use crate::semantic::Formattable;
 use crate::{config, semantic};
 use anyhow::Context;
 use std::{fs, io, path};

bear/src/semantic/command.rs

@@ -5,7 +5,8 @@
 //! It defines how to classify arguments, group them, and convert them into entries
 //! for the final compilation database.
 
-use crate::semantic::{clang, EntryFormat, Formattable};
+use crate::config;
+use crate::semantic::clang;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
@@ -85,14 +86,12 @@ impl CompilerCommand {
                 .collect(),
         }
     }
-}
 
-impl Formattable for CompilerCommand {
     /// Converts the compiler command into a list of entries for the compilation database.
     ///
     /// It processes the command arguments, identifies source files, and constructs
     /// entries with the executable, arguments, working directory, and output file if present.
-    fn to_entries(&self, config: &EntryFormat) -> Vec<clang::Entry> {
+    pub(super) fn to_entries(&self, config: &config::EntryFormat) -> Vec<clang::Entry> {
         // Find all source files in the arguments
         let source_files: Vec<String> = self
             .arguments
@@ -144,6 +143,7 @@ impl Formattable for CompilerCommand {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::config::EntryFormat;
 
     #[test]
     fn test_compiler_command_to_entries_single_source() {

bear/src/semantic/mod.rs

@@ -4,26 +4,13 @@
 //!
 //! This module provides traits and types for recognizing the semantic meaning of executed commands
 //! (such as compilers or interpreters) and for formatting their output into structured entries.
-//!
-//! # Main Components
-//!
-//! - [`Command`]: Enum representing recognized command types.
-//! - [`Interpreter`]: Trait for recognizing the semantic meaning of an `Execution`.
-//! - [`Formattable`]: Trait for converting recognized commands into output entries.
-//! - [`EntryFormat`]: Configuration for formatting output entries.
-//!
-//! Implementers of [`Interpreter`] analyze an `Execution` and determine if it matches a known command.
-//! If recognized, they return a boxed [`Command`] representing the semantic meaning of the execution.
-//!
-//! The [`Formattable`] trait allows recognized commands to be transformed into output entries (e.g.,
-//! for a compilation database), using the provided [`EntryFormat`].
 
 pub mod clang;
 pub mod command;
 pub mod interpreters;
 
 use super::intercept::Execution;
-use crate::config::EntryFormat;
+use crate::config;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 
@@ -41,6 +28,17 @@ pub enum Command {
     Filtered(String),
 }
 
+impl Command {
+    /// Converts the command into compilation database entries.
+    pub fn to_entries(&self, config: &config::EntryFormat) -> Vec<clang::Entry> {
+        match self {
+            Command::Compiler(cmd) => cmd.to_entries(config),
+            Command::Ignored(_) => vec![],
+            Command::Filtered(_) => vec![],
+        }
+    }
+}
+
 /// Responsible for recognizing the semantic meaning of an executed command.
 ///
 /// Implementers of this trait analyze an [`Execution`] and determine if it matches
@@ -50,19 +48,3 @@ pub trait Interpreter: Send {
     /// An [`Option<Command>`] containing the recognized command, or `None` if not recognized.
     fn recognize(&self, execution: &Execution) -> Option<Command>;
 }
-
-/// Trait for types that can be formatted into output entries.
-pub trait Formattable {
-    /// Converts the command into a list of entries, using the provided format configuration.
-    fn to_entries(&self, config: &EntryFormat) -> Vec<clang::Entry>;
-}
-
-impl Formattable for Command {
-    fn to_entries(&self, config: &EntryFormat) -> Vec<clang::Entry> {
-        match self {
-            Command::Compiler(cmd) => cmd.to_entries(config),
-            Command::Ignored(_) => vec![],
-            Command::Filtered(_) => vec![],
-        }
-    }
-}