Update bin/doc now that stable rustc does intra-doc links

Author: quodlibetor

bin/doc

@@ -17,29 +17,18 @@ cd "$(dirname "$0")/.."
 
 . misc/shlib/shlib.bash
 
-rustup=1
 for arg
 do
     case "$arg" in
-        --rustup) rustup=1 ;;
-        --rustup=*) die "--rustup option does not take an argument" ;;
-        --no-rustup) rustup= ;;
-        --no-rustup=*) die "--no-rustup option does not take an argument" ;;
+        -h|--help)
+            printf "usage: %s\n\nBuild the rust documentation site\n" "$0"
+            exit 0
+            ;;
         -*) die "unknown option $arg" ;;
-        *) die "usage: $0 [--rustup|--no-rustup]" ;;
+        *) die "usage: $0" ;;
     esac
 done
 
-cargo() {
-    if [[ "$rustup" ]]; then
-        command cargo +nightly "$@"
-    else
-        command cargo "$@"
-    fi
-}
-
-# Use nightly until stable supports intra-Rustdoc links.
-# https://github.com/rust-lang/rust/issues/43466
 cargo doc
 
 crates=$(cargo metadata --format-version=1 \
@@ -132,3 +121,5 @@ if (el.href != "index.html") {
     el.href = "../index.html";
 }
 EOF
+
+echo "Docs are in target/doc/index.html"

ci/deploy/devsite.sh

@@ -13,7 +13,7 @@
 
 set -euo pipefail
 
-bin/doc --no-rustup
+bin/doc
 bin/pydoc
 rsync misc/www/index.html buildkite@mtrlz.dev:/var/www/html/index.html
 rsync --archive target/doc/ buildkite@mtrlz.dev:/var/www/html/api/rust