Merge branch 'scarb-doc/inner-attributes' into scarb-doc/initial-mark…

…down

extensions/scarb-doc/src/compilation.rs

@@ -23,7 +23,6 @@ pub fn get_project_config(
     let corelib = get_corelib(compilation_unit_metadata);
     let dependencies = get_dependencies(compilation_unit_metadata);
     let crates_config = get_crates_config(metadata, compilation_unit_metadata);
-
     ProjectConfig {
         base_path: package_metadata.root.clone().into(),
         corelib: Some(Directory::Real(corelib.source_root().into())),

extensions/scarb-doc/src/main.rs

@@ -58,6 +58,7 @@ fn main() -> Result<()> {
     let crate_ = Crate::new(db, main_crate_id);
 
     print_module(&crate_.root_module);
+    println!("{crate_:?}");
 
     if args.save {
         let path = PathBuf::from(crate_.root_module.name.as_str());

extensions/scarb-doc/src/render.rs

@@ -153,13 +153,13 @@ impl Markdown for Trait {
         writeln!(
             &mut markdown,
             "{}",
-            self.lookup_item_data.doc.as_ref().unwrap_or(&String::new())
+            self.item_data.doc.as_ref().unwrap_or(&String::new())
         )?;
 
         writeln!(
             &mut markdown,
             "```rust\n{}\n```\n",
-            self.lookup_item_data.signature
+            self.item_data.signature
         )?;
 
         if !self.trait_constants.is_empty() {
@@ -190,7 +190,7 @@ impl Markdown for Trait {
         format!(
             "### {}\n{}",
             self.md_ref(),
-            self.lookup_item_data.doc.as_ref().unwrap_or(&String::new())
+            self.item_data.doc.as_ref().unwrap_or(&String::new())
         )
     }
 }
@@ -224,7 +224,7 @@ macro_rules! impl_md {
                 format!(
                     "##### {}\n{}",
                     self.item_data.name,
-                    self.lookup_item_data.doc.as_ref().unwrap_or(&String::new())
+                    self.item_data.doc.as_ref().unwrap_or(&String::new())
                 )
             }
         }