Clean up rustdoc run

1. The options specified in `rustdoc-with-private` are essentially the
   default now so we can remove this script.
2. `./mach browse-doc` is redundant with `./mach doc --open` which uses
   the underlying cargo functionality to browse the documentation.

Fixes #29888.
This commit is contained in:
Martin Robinson 2023-06-20 12:37:54 +02:00
parent 836ae5fa48
commit 4d7f250159
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
4 changed files with 5 additions and 41 deletions

View file

@ -14,6 +14,7 @@ import os
import os.path as path
import subprocess
from shutil import copytree, rmtree, copy2
from typing import List
import servo.util
@ -242,7 +243,7 @@ class PostBuildCommands(CommandBase):
'params', nargs='...',
help="Command-line arguments to be passed through to cargo doc")
@CommandBase.build_like_command_arguments
def doc(self, params, **kwargs):
def doc(self, params: List[str], **kwargs):
self.ensure_bootstrapped(rustup_components=["rust-docs"])
rustc_path = check_output(
["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"]
@ -278,12 +279,3 @@ class PostBuildCommands(CommandBase):
static = path.join(self.context.topdir, "etc", "doc.servo.org")
for name in os.listdir(static):
copy2(path.join(static, name), path.join(docs, name))
@Command('browse-doc',
description='Generate documentation and open it in a web browser',
category='post-build')
def serve_docs(self):
self.doc([])
import webbrowser
webbrowser.open("file://" + path.abspath(path.join(
servo.util.get_target_dir(), "doc", "servo", "index.html")))