2 files changed, 9 insertions, 36 deletions

diff --git a/crates/libanalysis/src/db/imp.rs b/crates/libanalysis/src/db/imp.rs
index 1b4ee5cf3..f26be1046 100644
--- a/crates/libanalysis/src/db/imp.rs
+++ b/crates/libanalysis/src/db/imp.rs
@@ -122,9 +122,6 @@ impl QueryRegistry {
         let config = config.with_query(id, q.f());
         self.config= Some(config);
     }
-    pub(super) fn finish(mut self) -> salsa::QueryConfig<State, Data> {
-        self.config.take().unwrap()
-    }
 }
 
 fn hash<T: Hash>(x: &T) -> u64 {
diff --git a/crates/libanalysis/src/db/mod.rs b/crates/libanalysis/src/db/mod.rs
index 1111a4f87..22769d112 100644
--- a/crates/libanalysis/src/db/mod.rs
+++ b/crates/libanalysis/src/db/mod.rs
@@ -29,6 +29,12 @@ pub(crate) struct QueryRegistry {
     imp: imp::QueryRegistry,
 }
 
+impl Default for Db {
+    fn default() -> Db {
+        Db::new()
+    }
+}
+
 impl Db {
     pub(crate) fn new() -> Db {
         let reg = QueryRegistry::new();
@@ -44,6 +50,7 @@ impl Db {
         let ctx = QueryCtx { imp: &self.imp.imp.query_ctx() };
         f(ctx)
     }
+    #[allow(unused)]
     pub(crate) fn trace_query<F: FnOnce(QueryCtx) -> R, R>(&self, f: F) -> (R, Vec<&'static str>) {
         let ctx = QueryCtx { imp: &self.imp.imp.query_ctx() };
         let res = f(ctx);
@@ -65,42 +72,11 @@ pub(crate) fn file_text(ctx: QueryCtx, file_id: FileId) -> Arc<String> {
 pub(crate) fn file_set(ctx: QueryCtx) -> Arc<(Vec<FileId>, FileResolverImp)> {
     imp::file_set(ctx)
 }
-pub(crate) use self::queries::file_syntax;
-
-mod queries {
-    use std::sync::Arc;
-    use libsyntax2::File;
-    use libeditor::LineIndex;
-    use {FileId};
-    use super::{Query, QueryCtx, QueryRegistry, file_text};
-
-    pub(crate) fn register_queries(reg: &mut QueryRegistry) {
-        reg.add(FILE_SYNTAX, "FILE_SYNTAX");
-        reg.add(FILE_LINES, "FILE_LINES");
-    }
-
-    pub(crate) fn file_syntax(ctx: QueryCtx, file_id: FileId) -> File {
-        (&*ctx.get(FILE_SYNTAX, file_id)).clone()
-    }
-    pub(crate) fn file_lines(ctx: QueryCtx, file_id: FileId) -> Arc<LineIndex> {
-        ctx.get(FILE_LINES, file_id)
-    }
-
-    pub(super) const FILE_SYNTAX: Query<FileId, File> = Query(16, |ctx, file_id: &FileId| {
-        let text = file_text(ctx, *file_id);
-        File::parse(&*text)
-    });
-    pub(super) const FILE_LINES: Query<FileId, LineIndex> = Query(17, |ctx, file_id: &FileId| {
-        let text = file_text(ctx, *file_id);
-        LineIndex::new(&*text)
-    });
-}
-
 impl QueryRegistry {
     fn new() -> QueryRegistry {
         let mut reg = QueryRegistry { imp: imp::QueryRegistry::new() };
-        queries::register_queries(&mut reg);
-        ::module_map_db::register_queries(&mut reg);
+        ::queries::register_queries(&mut reg);
+        ::module_map::register_queries(&mut reg);
         reg
     }
     pub(crate) fn add<Q: imp::EvalQuery>(&mut self, q: Q, name: &'static str) {