clang module is part of semantic now

Author: rizsotto

bear/src/output/formats.rs

@@ -7,8 +7,8 @@
 //! - The semantic database format. (Internal format of this project.)
 //! - The execution event database format. (Internal format of this project.)
 
-use super::{clang, json};
-use crate::{intercept, semantic};
+use super::json;
+use crate::{intercept, semantic, semantic::clang};
 use serde_json::de::IoRead;
 use serde_json::StreamDeserializer;
 use std::io;
@@ -145,7 +145,7 @@ impl FileFormat<intercept::Event> for ExecutionEventDatabase {
 #[cfg(test)]
 mod test {
     mod compilation_database {
-        use super::super::clang::{Entry, EntryError};
+        use super::super::semantic::clang::{Entry, EntryError};
         use super::super::JsonCompilationDatabase as Sut;
         use super::super::{Error, FileFormat};
         use serde_json::error::Category;

bear/src/output/mod.rs

@@ -10,7 +10,6 @@
 //! The `OutputWriter` enum represents the main entry point for writing the output.
 //! The input of the `OutputWriter` is a stream of `semantic::CompilerCall` instances.
 
-mod clang;
 mod formats;
 mod json;
 mod writers;

bear/src/output/writers.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use super::clang::{DuplicateEntryFilter, Entry, EntryConverter};
 use super::formats::{FileFormat, JsonCompilationDatabase, JsonSemanticDatabase};
+use crate::semantic::clang::{DuplicateEntryFilter, Entry, EntryConverter};
 use crate::{config, semantic};
 use anyhow::Context;
 use std::{fs, io, path};

bear/src/output/clang/converter.rs renamed to bear/src/semantic/clang/converter.rs

@@ -10,6 +10,7 @@
 //! We are interested in the compiler passes, because those are the
 //! ones that are relevant to build a JSON compilation database.
 
+pub mod clang;
 pub mod interpreters;
 pub mod transformation;