simplify lib.rs

RustPython · youknowone · Nov 14, 2025 · Nov 1, 2025 · Nov 3, 2025 · Nov 3, 2025
commit c3b191ecae5730438e67fed8b065f86f5a0d982e
diff --git a/crates/rustpython_doc_db/src/lib.rs b/crates/rustpython_doc_db/src/lib.rs
@@ -1,45 +1,19 @@
-pub type Result = std::result::Result<Option<&'static str>, ()>;
+#[cfg(windows)]
+include!("./win32.inc.rs");
 
-pub struct Database {
-    inner: phf::Map<&'static str, Option<&'static str>>,
-}
-
-impl Database {
-    pub fn shared() -> &'static Self {
-        static DATABASE: Database = {
-            #[cfg(windows)]
-            let data = include!("./win32.inc.rs");
-
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            let data = include!("./linux.inc.rs");
+#[cfg(any(target_os = "linux", target_os = "android"))]
+include!("./linux.inc.rs");
 
-            #[cfg(any(target_os = "macos", target_os = "ios"))]
-            let data = include!("./darwin.inc.rs");
-
-            Database { inner: data }
-        };
-
-        &DATABASE
-    }
-
-    pub fn try_path(&self, path: &str) -> Result {
-        self.inner.get(path).copied().ok_or(())
-    }
-
-    pub fn try_module_item(&self, module: &str, item: &str) -> Result {
-        self.try_path(&format!("{}.{}", module, item))
-    }
-}
+#[cfg(any(target_os = "macos", target_os = "ios"))]
-#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[cfg(target_vendor = "apple")]
-#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[cfg(target_vendor = "apple")]
+include!("./darwin.inc.rs");
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use super::DB;
 
     #[test]
-    fn test_module_item() {
-        let doc = Database::shared()
-            .try_module_item("array", "_array_reconstructor")
-            .unwrap();
+    fn test_db() {
+        let doc = DB.get("array._array_reconstructor");
         assert!(doc.is_some());
     }
 }
diff --git a/derive-impl/src/pyclass.rs b/derive-impl/src/pyclass.rs
@@ -6,7 +6,7 @@ use crate::util::{
 };
 use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
 use quote::{ToTokens, quote, quote_spanned};
-use rustpython_doc_db::Database;
+use rustpython_doc_db::DB;
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
 use syn::{Attribute, Ident, Item, Result, parse_quote, spanned::Spanned};
@@ -316,10 +316,8 @@ fn generate_class_def(
 ) -> Result<TokenStream> {
     let doc = attrs.doc().or_else(|| {
         let module_name = module_name.unwrap_or("builtins");
-        Database::shared()
-            .try_module_item(module_name, name)
-            .ok()
-            .flatten()
+        DB.get(&format!("{module_name}.{name}"))
+            .copied()
             .map(str::to_owned)
     });
     let doc = if let Some(doc) = doc {

diff --git a/derive-impl/src/pymodule.rs b/derive-impl/src/pymodule.rs
@@ -6,7 +6,7 @@ use crate::util::{
 };
 use proc_macro2::{Delimiter, Group, TokenStream, TokenTree};
 use quote::{ToTokens, quote, quote_spanned};
-use rustpython_doc_db::Database;
+use rustpython_doc_db::DB;
 use std::{collections::HashSet, str::FromStr};
 use syn::{Attribute, Ident, Item, Result, parse_quote, spanned::Spanned};
 use syn_ext::ext::*;
@@ -101,13 +101,7 @@ pub fn impl_pymodule(attr: PunctuatedNestedMeta, module_item: Item) -> Result<To
     let module_name = context.name.as_str();
     let function_items = context.function_items.validate()?;
     let attribute_items = context.attribute_items.validate()?;
-    let doc = doc.or_else(|| {
-        Database::shared()
-            .try_path(module_name)
-            .ok()
-            .flatten()
-            .map(str::to_owned)
-    });
+    let doc = doc.or_else(|| DB.get(module_name).copied().map(str::to_owned));
     let doc = if let Some(doc) = doc {
         quote!(Some(#doc))
     } else {
@@ -464,11 +458,10 @@ impl ModuleItem for FunctionItem {
         let sig_doc = text_signature(func.sig(), &py_name);
 
         let module = args.module_name();
+        // TODO: doc must exist at least one of code or CPython
         let doc = args.attrs.doc().or_else(|| {
-            Database::shared()
-                .try_module_item(module, &py_name)
-                .ok() // TODO: doc must exist at least one of code or CPython
-                .flatten()
+            DB.get(&format!("{module}.{py_name}"))
+                .copied()
                 .map(str::to_owned)
         });
         let doc = if let Some(doc) = doc {