5 files changed, 53 insertions, 13 deletions
diff --git a/.run/src/bin/ci.rs b/.run/src/bin/ci.rs
index f3ae9e8..4b6f973 100644
--- a/.run/src/bin/ci.rs
+++ b/.run/src/bin/ci.rs
@@ -1,6 +1,7 @@
 use std::io::Write as _;
 use std::process::exit;
 
+use arg_picker::{Picker, macros::arg};
 use tools::{
     cargo_tomls, crate_name_from, eprintln_cargo_style, println_cargo_style, run_cmd, run_parallel,
 };
@@ -35,19 +36,20 @@ fn main() {
     let _ = colored::control::set_virtual_terminal(true);
     println!("{}", include_str!("../../../docs/res/ci_banner.txt"));
 
-    let args: Vec<String> = std::env::args().collect();
+    let (auto_yes, dirty, test_docs, refresh_docs, test_codes, help) = Picker::from_args()
+        .pick_or_default(&arg![yes: bool, 'y'])
+        .pick_or_default(&arg![dirty: bool])
+        .pick_or_default(&arg![test_docs: bool])
+        .pick_or_default(&arg![refresh_docs: bool])
+        .pick_or_default(&arg![test_codes: bool])
+        .pick_or_default(&arg![help: bool, 'h'])
+        .unwrap();
 
-    if args.iter().any(|a| a == "-h" || a == "--help") {
+    if help {
         print_help();
         return;
     }
 
-    let auto_yes = args.iter().any(|a| a == "-y");
-    let dirty = args.iter().any(|a| a == "--dirty");
-
-    let test_docs = args.iter().any(|a| a == "--test-docs");
-    let refresh_docs = args.iter().any(|a| a == "--refresh-docs");
-    let test_codes = args.iter().any(|a| a == "--test-codes");
     let any_specified = test_docs || refresh_docs || test_codes;
     let run_all = !any_specified;
 
@@ -140,6 +142,11 @@ fn ci(test_docs: bool, test_codes: bool, run_all: bool) -> Result<(), i32> {
             exit_code = exit_code.max(code);
         }
 
+        println_cargo_style!("Phase: Try Build API docs");
+        if let Err(code) = deploy_api_docs() {
+            exit_code = exit_code.max(code);
+        }
+
         if exit_code != 0 {
             return Err(exit_code);
         }
@@ -223,6 +230,12 @@ fn test_all() -> Result<(), i32> {
     run_parallel("Testing", tasks)
 }
 
+fn deploy_api_docs() -> Result<(), i32> {
+    run_cmd!(
+        "cargo run --manifest-path .run/Cargo.toml --color always --bin deploy-api-docs -- --docsrs"
+    )
+}
+
 fn docs_refresh() -> Result<(), i32> {
     println_cargo_style!("Refresh: document at `./docs/`");
 
diff --git a/.run/src/bin/clippy.sh b/.run/src/bin/clippy.sh
index b393545..b393545 100644..100755
--- a/.run/src/bin/clippy.sh
+++ b/.run/src/bin/clippy.sh
diff --git a/.run/src/bin/deploy-api-docs.rs b/.run/src/bin/deploy-api-docs.rs
index 7aa093c..961eb04 100644
--- a/.run/src/bin/deploy-api-docs.rs
+++ b/.run/src/bin/deploy-api-docs.rs
@@ -1,10 +1,15 @@
 use std::path::Path;
 
+use arg_picker::{Picker, macros::arg};
 use tools::{println_cargo_style, run_cmd};
 
 const OUTPUT_DIR: &str = "docs/api-docs";
 
 fn main() {
+    let using_docsrs = Picker::from_args()
+        .pick_or_default(&arg![docsrs: bool])
+        .unwrap();
+
     let repo_root = find_git_repo().expect("Failed to find git repository root");
 
     // Read features from [package.metadata.docs.rs]
@@ -20,11 +25,19 @@ fn main() {
     std::fs::create_dir_all(&output_path).expect("Failed to create output directory");
 
     // Build cargo doc command
-    let cmd = format!(
-        "cargo doc --no-deps --features \"{}\" -p mingling --target-dir \"{}\" --color always",
-        features_arg,
-        output_path.join("target").to_string_lossy()
-    );
+    let cmd = if using_docsrs {
+        format!(
+            "cargo +nightly rustdoc --features \"{}\" -p mingling --target-dir \"{}\" --color always -- --cfg docsrs",
+            features_arg,
+            output_path.join("target").to_string_lossy()
+        )
+    } else {
+        format!(
+            "cargo doc --no-deps --features \"{}\" -p mingling --target-dir \"{}\" --color always",
+            features_arg,
+            output_path.join("target").to_string_lossy()
+        )
+    };
 
     println_cargo_style!("Features: {}", features_arg);
     println_cargo_style!("Output: {}", output_path.display());
diff --git a/.run/src/bin/doc-nightly.ps1 b/.run/src/bin/doc-nightly.ps1
new file mode 100644
index 0000000..30d6aaf
--- /dev/null
+++ b/.run/src/bin/doc-nightly.ps1
@@ -0,0 +1,6 @@
+cargo +nightly rustdoc `
+    --manifest-path mingling/Cargo.toml `
+    --features docs_rs,core,macros,builds,structural_renderer,repl,comp,parser,picker,clap,extra_macros `
+    --open `
+    -- `
+    --cfg docsrs
diff --git a/.run/src/bin/doc-nightly.sh b/.run/src/bin/doc-nightly.sh
new file mode 100644
index 0000000..944f4b3
--- /dev/null
+++ b/.run/src/bin/doc-nightly.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cargo rustdoc \
+  --manifest-path mingling/Cargo.toml \
+  --features docs_rs,core,macros,builds,structural_renderer,repl,comp,parser,picker,clap,extra_macros \
+  --open \
+  -- \
+  --cfg docsrs