Rust: solve all compilation errors but the ones related to the crate graph

Author: Paolo Tranquilli

rust/extractor/src/config.rs

@@ -213,8 +213,7 @@ fn to_cfg_overrides(specs: &Vec<String>) -> CfgOverrides {
     }
     let enabled_cfgs = enabled_cfgs.into_iter().collect();
     let disabled_cfgs = disabled_cfgs.into_iter().collect();
-    let global = CfgDiff::new(enabled_cfgs, disabled_cfgs)
-        .expect("There should be no duplicate cfgs by construction");
+    let global = CfgDiff::new(enabled_cfgs, disabled_cfgs);
     CfgOverrides {
         global,
         ..Default::default()

rust/extractor/src/crate_graph.rs

@@ -402,7 +402,7 @@ fn emit_adt(
             );
         }
         ra_ap_hir_def::AdtId::EnumId(enum_id) => {
-            let data = db.enum_data(enum_id);
+            let data = db.enum_variants(enum_id);
             let variants = data
                 .variants
                 .iter()
@@ -480,13 +480,13 @@ fn emit_trait(
     visibility: Visibility,
 ) -> Vec<trap::Label<generated::Item>> {
     let mut items = Vec::new();
-    let data = db.trait_data(trait_id);
+    let data = db.trait_items(trait_id);
     let assoc_items: Vec<trap::Label<generated::AssocItem>> = data
         .items
         .iter()
         .flat_map(|(name, item)| {
             if let AssocItemId::FunctionId(function) = item {
-                let sig = db.callable_item_signature((*function).into());
+                let sig = db.callable_item_signature(function.clone().into());
                 let sig = sig.skip_binders();
                 let params = sig
                     .params()
@@ -582,24 +582,25 @@ fn emit_module_impls(
     module.scope.impls().for_each(|imp| {
         let self_ty = db.impl_self_ty(imp);
         let self_ty = emit_hir_ty(trap, crate_graph, db, self_ty.skip_binders());
-        let imp = db.impl_data(imp);
-        let trait_ = imp
+        let imp_data = db.impl_data(imp);
+        let trait_ = imp_data
             .target_trait
             .as_ref()
-            .and_then(|t| make_qualified_path(trap, emit_hir_path(&imp.types_map[t.path])));
+            .and_then(|t| make_qualified_path(trap, emit_hir_path(&imp_data.types_map[t.path])));
         let trait_ = trait_.map(|trait_| {
             trap.emit(generated::PathTypeRepr {
                 id: trap::TrapId::Star,
                 path: Some(trait_),
             })
             .into()
         });
-        let assoc_items = imp
+        let imp_items = db.impl_items(imp);
+        let assoc_items = imp_items
             .items
             .iter()
             .flat_map(|item| {
                 if let (name, AssocItemId::FunctionId(function)) = item {
-                    let sig = db.callable_item_signature((*function).into());
+                    let sig = db.callable_item_signature(function.clone().into());
                     let sig = sig.skip_binders();
                     let params = sig
                         .params()
@@ -631,7 +632,7 @@ fn emit_module_impls(
                         id: trap::TrapId::Star,
                         text: Some(name.as_str().to_owned()),
                     }));
-                    let data = db.function_data(*function);
+                    let data = db.function_data(function.clone());
                     let visibility = emit_visibility(
                         crate_graph,
                         db,

rust/extractor/src/rust_analyzer.rs

@@ -1,13 +1,13 @@
 use itertools::Itertools;
-use ra_ap_base_db::SourceDatabase;
+use ra_ap_base_db::{EditionedFileId, RootQueryDb, SourceDatabase};
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_load_cargo::{LoadCargoConfig, load_workspace_at};
 use ra_ap_paths::{AbsPath, Utf8PathBuf};
 use ra_ap_project_model::ProjectManifest;
 use ra_ap_project_model::{CargoConfig, ManifestPath};
 use ra_ap_span::Edition;
-use ra_ap_span::EditionedFileId;
+use ra_ap_span::EditionedFileId as SpanEditionedFileId;
 use ra_ap_span::TextRange;
 use ra_ap_span::TextSize;
 use ra_ap_syntax::SourceFile;
@@ -73,7 +73,7 @@ impl<'a> RustAnalyzer<'a> {
                 if let Some(file_id) = path_to_file_id(path, vfs) {
                     if let Ok(input) = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
                     {
-                        let file_id = EditionedFileId::current_edition(file_id);
+                        let file_id = EditionedFileId::new(semantics.db, SpanEditionedFileId::current_edition(file_id));
                         let source_file = semantics.parse(file_id);
                         let errors = semantics
                             .db
@@ -84,7 +84,7 @@ impl<'a> RustAnalyzer<'a> {
 
                         return ParseResult {
                             ast: source_file,
-                            text: input,
+                            text: input.text(semantics.db),
                             errors,
                             semantics_info: Ok(FileSemanticInformation { file_id, semantics }),
                         };

rust/extractor/src/translate/base.rs

@@ -4,8 +4,8 @@ use crate::rust_analyzer::FileSemanticInformation;
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
 use itertools::Either;
-use ra_ap_base_db::CrateOrigin;
-use ra_ap_base_db::ra_salsa::InternKey;
+use ra_ap_base_db::{CrateOrigin, EditionedFileId};
+use ra_ap_base_db::salsa::plumbing::AsId;
 use ra_ap_hir::db::ExpandDatabase;
 use ra_ap_hir::{
     Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type, Variant,
@@ -16,7 +16,7 @@ use ra_ap_hir_expand::ExpandTo;
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_parser::SyntaxKind;
-use ra_ap_span::{EditionedFileId, TextSize};
+use ra_ap_span::TextSize;
 use ra_ap_syntax::ast::HasName;
 use ra_ap_syntax::{
     AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
@@ -148,7 +148,7 @@ impl<'a> Translator<'a> {
         if let Some(semantics) = self.semantics.as_ref() {
             let file_range = semantics.original_range(node.syntax());
             let file_id = self.file_id?;
-            if file_id == file_range.file_id {
+            if file_id.file_id(semantics.db) == file_range.file_id {
                 Some(file_range.range)
             } else {
                 None
@@ -401,7 +401,7 @@ impl<'a> Translator<'a> {
     fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
         if let Some(block_id) = ModuleId::from(item).containing_block() {
             // this means this is a block module, i.e. a virtual module for a block scope
-            return Some(format!("{{{}}}", block_id.as_intern_id()));
+            return Some(format!("{{{}}}", block_id.as_id().as_u32()));
         }
         if item.is_crate_root() {
             return Some("crate".into());