youknowone · Sep 27, 2026 · Sep 27, 2026 · Sep 26, 2026 · coderabbitai · Sep 27, 2026
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,8 +19,8 @@
   cancel-in-progress: true
 
 env:
-  CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env
-  CARGO_ARGS_NO_SSL: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,host_env
+  CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env,doc
+  CARGO_ARGS_NO_SSL: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,host_env,doc
   # Crates excluded from workspace builds:
   # - rustpython_wasm: requires wasm target
   # - rustpython-venvlauncher: Windows-only
@@ -543,7 +543,7 @@
          echo "cores=${cores}" >> "$GITHUB_OUTPUT"

      - name: Run CPython tests
        run: |
          target/release/rustpython -u -m test --slow-ci -j "$CORES" $EXTRA_TEST_ARGS $SKIPS
        timeout-minutes: ${{ matrix.timeout }}
        shell: bash
@@ -1052,7 +1052,7 @@
 
       - name: build rustpython
         if: env.RUN_WASM_WASI == 'true'
-        run: cargo build --locked --profile wasm-release --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,stdio,importlib,host_env --verbose
+        run: cargo build --locked --profile wasm-release --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,stdio,importlib,host_env,doc --verbose
       - name: run snippets
         if: env.RUN_WASM_WASI == 'true'
         run: |

diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml
@@ -14,7 +14,7 @@ on:
       - .github/workflows/cron-ci.yaml
 
 env:
-  CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls-aws-lc,jit,host_env
+  CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls-aws-lc,jit,host_env,doc
 
 jobs:
   # codecov collects code coverage data from the rust tests, python snippets and python test suite.
@@ -42,7 +42,7 @@ jobs:
       - run: sudo apt-get update && sudo apt-get -y install lcov
 
       - name: Run cargo-llvm-cov with Rust tests.
-        run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher --exclude rustpython-capi --verbose --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls-aws-lc,jit,host_env
+        run: cargo llvm-cov --no-report --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher --exclude rustpython-capi --verbose --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls-aws-lc,jit,host_env,doc
 
       - name: Run cargo-llvm-cov with Python snippets.
         run: python scripts/cargo-llvm-cov.py

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -75,7 +75,7 @@ jobs:
           libtool: true
 
       - name: Build RustPython
-        run: cargo build --release --target=${{ matrix.target }} --verbose --no-default-features --features stdlib,stdio,importlib,encodings,sqlite,host_env,ssl-rustls-aws-lc,threading,jit
+        run: cargo build --release --target=${{ matrix.target }} --verbose --no-default-features --features stdlib,stdio,importlib,encodings,sqlite,host_env,ssl-rustls-aws-lc,threading,jit,doc
 
       - name: Rename Binary
         run: cp target/${{ matrix.target }}/release/rustpython target/rustpython-release-${{ runner.os }}-${{ matrix.target }}
@@ -107,7 +107,7 @@ jobs:
           targets: wasm32-wasip1
 
       - name: Build RustPython
-        run: cargo build --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib --release
+        run: cargo build --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,doc --release
 
       - name: Rename Binary
         run: cp target/wasm32-wasip1/release/rustpython.wasm target/rustpython-release-wasm32-wasip1.wasm

diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml
@@ -20,7 +20,7 @@ env:
   CARGO_PROFILE_DEV_DEBUG: 0
   CARGO_PROFILE_RELEASE_DEBUG: 0
   # Keep feature list in sync with CI's release build in .github/workflows/ci.yaml.
-  CARGO_ARGS: --workspace --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env,threading,jit --exclude rustpython_wasm --exclude rustpython-venvlauncher
+  CARGO_ARGS: --workspace --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env,threading,jit,doc --exclude rustpython_wasm --exclude rustpython-venvlauncher
 
 jobs:
   build-caches:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,8 @@ license.workspace = true
 
 [features]
 capi = ["dep:rustpython-capi", "threading"]
-default = ["threading", "stdlib", "stdio", "importlib", "ssl-rustls-aws-lc", "host_env", "mimalloc"]
+default = ["threading", "stdlib", "stdio", "importlib", "ssl-rustls-aws-lc", "host_env", "mimalloc", "doc"]
+doc = ["rustpython-vm/doc", "rustpython-stdlib?/doc"]
 mimalloc = ["dep:mimalloc"]
 host_env = ["rustpython-vm/host_env", "rustpython-stdlib?/host_env"]
 importlib = ["rustpython-vm/importlib"]
@@ -39,7 +40,7 @@ winresource = "0.1"
 rustpython-capi = { workspace = true, optional = true }
 rustpython-compiler = { workspace = true }
 rustpython-pylib = { workspace = true, optional = true }
-rustpython-stdlib = { workspace = true, optional = true, features = ["compiler"] }
+rustpython-stdlib = { workspace = true, optional = true, default-features = false, features = ["compiler"] }
 rustpython-vm = { workspace = true, features = ["compiler", "gc"] }
 
 log = { workspace = true }

diff --git a/crates/capi/src/descrobject.rs b/crates/capi/src/descrobject.rs
@@ -9,7 +9,7 @@ use rustpython_vm::builtins::{
     PyMappingProxy, PyMemberDescriptor, PyType,
 };
 use rustpython_vm::common::lock::PyRwLock;
-use rustpython_vm::function::PySetterValue;
+use rustpython_vm::function::{ItemDoc, PySetterValue};
 use rustpython_vm::{Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine};
 
 #[repr(C)]
@@ -134,7 +134,10 @@ impl PyMemberDef {
             flags &= !PY_RELATIVE_OFFSET;
         }
 
-        let doc = unsafe { self.doc.try_as_str_opt(vm) }?.map(str::to_owned);
+        let doc = unsafe { self.doc.try_as_str_opt(vm) }?.map_or(ItemDoc::NONE, |doc| {
+            let text: &'static str = Box::leak(doc.to_owned().into_boxed_str());
+            ItemDoc::static_text(text)
+        });
 
         let descriptor = PyMemberDescriptor {
             common: PyDescriptorOwned {

diff --git a/crates/capi/src/methodobject.rs b/crates/capi/src/methodobject.rs
@@ -4,7 +4,7 @@ use crate::object::define_py_check;
 use crate::pystate::with_vm;
 use crate::util::{CStrExt, FfiPtrExt};
 use core::ffi::{c_char, c_int};
-use rustpython_vm::function::{FuncArgs, HeapMethodDef, PosArgs, PyMethodFlags};
+use rustpython_vm::function::{FuncArgs, HeapMethodDef, ItemDoc, PosArgs, PyMethodFlags};
 use rustpython_vm::{AsObject, PyObjectRef, PyRef, PyResult, VirtualMachine};
 
 define_py_check!(fn PyCFunction_Check, types.builtin_function_or_method_type);
@@ -49,6 +49,12 @@ pub(crate) fn build_method_def(
     let name = unsafe { ml.ml_name.try_as_str(vm) }?;
 
     let doc = unsafe { ml.ml_doc.try_as_str_opt(vm) }?;
+    let doc = doc
+        .filter(|doc| !doc.is_empty())
+        .map_or(ItemDoc::NONE, |doc| {
+            let text: &'static str = Box::leak(doc.to_owned().into_boxed_str());
+            ItemDoc::static_text(text)
+        });
 
     let flags = PyMethodFlags::from_bits(ml.ml_flags as u32)
         .ok_or_else(|| vm.new_system_error("PyMethodDef contains unknown flags"))?;

diff --git a/crates/derive-impl/src/class_docs.rs b/crates/derive-impl/src/class_docs.rs
@@ -4,6 +4,7 @@ use alloc::collections::BTreeSet;
 
 use proc_macro2::TokenStream;
 use quote::quote;
+use rustpython_doc::DocRef;
 
 /// Modules `get_qualified` consults for `module`.
 fn module_aliases(module: &str) -> Vec<String> {
@@ -26,20 +27,50 @@ fn module_aliases(module: &str) -> Vec<String> {
     aliases
 }
 
+pub(crate) fn item_doc_tokens(doc: Option<DocRef>, rust_doc: Option<String>) -> TokenStream {
+    if let Some(doc) = doc.filter(|doc| doc.len != 0) {
+        let offset = doc.offset;
+        let len = doc.len;
+        quote! {
+            {
+                #[cfg(feature = "doc")]
+                {
+                    ::rustpython_vm::function::ItemDoc {
+                        text: None,
+                        offset: #offset,
+                        len: #len,
+                    }
+                }
+                #[cfg(not(feature = "doc"))]
+                {
+                    ::rustpython_vm::function::ItemDoc::NONE
+                }
+            }
+        }
+    } else if let Some(rust_doc) = rust_doc {
+        quote!(::rustpython_vm::function::ItemDoc::static_text(#rust_doc))
+    } else {
+        quote!(::rustpython_vm::function::ItemDoc::NONE)
+    }
+}
+
 /// `get_attr`, then `class_attr_doc` when that entry is missing or empty.
-/// An explicit empty entry with no fallback is `Some("")`.
-fn resolved_attr_doc(module_name: Option<&str>, class: &str, attr: &str) -> Option<&'static str> {
+/// An explicit empty entry with no fallback is `Some` with `len == 0`.
+fn resolved_attr_doc(module_name: Option<&str>, class: &str, attr: &str) -> Option<DocRef> {
     let module_key = module_name.unwrap_or("builtins");
     let exact = rustpython_doc::get_attr(module_key, class, attr);
     let qualified = rustpython_doc::class_attr_doc(module_name, class, attr);
     match exact {
-        Some(doc) if !doc.is_empty() => Some(doc),
-        Some(_) => qualified.or(Some("")),
+        Some(doc) if doc.len != 0 => Some(doc),
+        Some(_) => qualified.or(Some(DocRef { offset: 0, len: 0 })),
         None => qualified,
     }
 }
 
-pub(crate) fn attr_docs_tokens(module_name: Option<&str>, class: &str) -> TokenStream {
+pub(crate) fn attr_docs_tokens(
+    module_name: Option<&str>,
+    class: &str,
+) -> (TokenStream, TokenStream) {
     let module_key = module_name.unwrap_or("builtins");
     let mut names = BTreeSet::new();
     for module in module_aliases(module_key) {
@@ -53,9 +84,16 @@ pub(crate) fn attr_docs_tokens(module_name: Option<&str>, class: &str) -> TokenS
             }
         }
     }
-    let entries = names.into_iter().filter_map(|attr| {
-        let doc = resolved_attr_doc(module_name, class, attr)?;
-        Some(quote! { (#attr, #doc) })
-    });
-    quote! { &[#(#entries),*] }
+    let mut spans = Vec::new();
+    let mut name_lits = Vec::new();
+    for attr in names {
+        let Some(doc) = resolved_attr_doc(module_name, class, attr) else {
+            continue;
+        };
+        name_lits.push(quote!(#attr));
+        let offset = if doc.len == 0 { u32::MAX } else { doc.offset };
+        let len = doc.len;
+        spans.push(quote! { (#attr, #offset, #len) });
+    }
+    (quote! { &[#(#spans),*] }, quote! { &[#(#name_lits),*] })
 }