WIP: test and runnable explorer

crates/hir/src/semantics.rs

@@ -88,8 +88,8 @@ impl PathResolution {
 }
 
 /// Primary API to get semantic information, like types, from syntax trees.
-pub struct Semantics<'db, DB> {
-    pub db: &'db DB,
+pub struct Semantics<'db> {
+    pub db: &'db dyn HirDatabase,
     imp: SemanticsImpl<'db>,
 }
 
@@ -100,14 +100,14 @@ pub struct SemanticsImpl<'db> {
     cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
 }
 
-impl<DB> fmt::Debug for Semantics<'_, DB> {
+impl fmt::Debug for Semantics<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Semantics {{ ... }}")
     }
 }
 
-impl<'db, DB: HirDatabase> Semantics<'db, DB> {
-    pub fn new(db: &DB) -> Semantics<DB> {
+impl<'db> Semantics<'db> {
+    pub fn new(db: &dyn HirDatabase) -> Semantics {
         let impl_ = SemanticsImpl::new(db);
         Semantics { db, imp: impl_ }
     }

crates/hir_def/src/lib.rs

@@ -200,7 +200,7 @@ macro_rules! impl_intern {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct FunctionId(salsa::InternId);
-type FunctionLoc = AssocItemLoc<Function>;
+pub type FunctionLoc = AssocItemLoc<Function>;
 impl_intern!(FunctionId, FunctionLoc, intern_function, lookup_intern_function);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]

crates/ide/src/lib.rs

@@ -53,18 +53,12 @@ mod typing;
 mod view_crate_graph;
 mod view_hir;
 mod view_item_tree;
+mod runnables;
 
 use std::sync::Arc;
 
 use cfg::CfgOptions;
-use ide_db::{
-    base_db::{
-        salsa::{self, ParallelDatabase},
-        Env, FileLoader, FileSet, SourceDatabase, VfsPath,
-    },
-    symbol_index::{self, FileSymbol},
-    LineIndexDatabase,
-};
+use ide_db::{LineIndexDatabase, base_db::{Env, FileLoader, FileSet, SourceDatabase, Upcast, VfsPath, salsa::{self, ParallelDatabase}}, symbol_index::{self, FileSymbol}};
 use syntax::SourceFile;
 
 use crate::display::ToNav;
@@ -476,7 +470,7 @@ impl Analysis {
 
     /// Returns the set of possible targets to run for the current file.
     pub fn runnables(&self, file_id: FileId) -> Cancellable<Vec<Runnable>> {
-        self.with_db(|db| runnables::runnables(db, file_id))
+        self.with_db(|db| runnables::runnables(db.upcast(), file_id))
     }
 
     /// Returns the set of tests for the given file position.