Merge pull request RustPython#3638 from youknowone/derive

rustpython-doc as external module

Author: youknowone

Cargo.lock

@@ -22,3 +22,4 @@ once_cell = "1.10.0"
 textwrap = { version = "0.15.0", default-features = false }
 indexmap = "1.8.1"
 itertools = "0.10.3"
+rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" }

derive/Cargo.toml

@@ -13,7 +13,6 @@ mod error;
 mod util;
 
 mod compile_bytecode;
-mod doc;
 mod from_args;
 mod pyclass;
 mod pymodule;
@@ -23,6 +22,7 @@ mod pystructseq;
 use error::{extract_spans, Diagnostic};
 use proc_macro2::TokenStream;
 use quote::ToTokens;
+use rustpython_doc as doc;
 use syn::{parse_macro_input, AttributeArgs, DeriveInput, Item};
 
 fn result_to_tokens(result: Result<TokenStream, impl Into<Diagnostic>>) -> proc_macro::TokenStream {

derive/docs.rsinc

@@ -191,7 +191,8 @@ fn generate_class_def(
 ) -> Result<TokenStream> {
     let doc = attrs.doc().or_else(|| {
         let module_name = module_name.unwrap_or("builtins");
-        crate::doc::try_module_item(module_name, name)
+        crate::doc::Database::shared()
+            .try_module_item(module_name, name)
             .ok()
             .flatten()
             .map(str::to_owned)

derive/src/doc.rs

@@ -89,7 +89,8 @@ pub fn impl_pymodule(attr: AttributeArgs, module_item: Item) -> Result<TokenStre
     let module_name = context.name.as_str();
     let module_extend_items = context.module_extend_items.validate()?;
     let doc = doc.or_else(|| {
-        crate::doc::try_read(module_name)
+        crate::doc::Database::shared()
+            .try_path(module_name)
             .ok()
             .flatten()
             .map(str::to_owned)
@@ -320,7 +321,8 @@ impl ModuleItem for FunctionItem {
         let (tokens, py_names) = {
             let module = args.module_name();
             let doc = args.attrs.doc().or_else(|| {
-                crate::doc::try_module_item(module, &py_name)
+                crate::doc::Database::shared()
+                    .try_module_item(module, &py_name)
                     .ok() // TODO: doc must exist at least one of code or CPython
                     .flatten()
                     .map(str::to_owned)