diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-06-20 12:37:54 +0200 |
---|---|---|
committer | Martin Robinson <mrobinson@igalia.com> | 2023-06-20 12:42:43 +0200 |
commit | 4d7f250159d71210eee3abaf3bd2f37d289c5844 (patch) | |
tree | 09b47444aecd12dc8edca1ccda77b5f259a8d5ff /python/servo/command_base.py | |
parent | 836ae5fa48b7cb60dd801e6cd20becc1d839e8f5 (diff) | |
download | servo-4d7f250159d71210eee3abaf3bd2f37d289c5844.tar.gz servo-4d7f250159d71210eee3abaf3bd2f37d289c5844.zip |
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.
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r-- | python/servo/command_base.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 211691b6e62..2fe515dd19f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -10,7 +10,7 @@ from __future__ import print_function import contextlib -from typing import Optional +from typing import List, Optional import distro import functools import gzip @@ -616,11 +616,7 @@ class CommandBase(object): if hosts_file_path: env['HOST_FILE'] = hosts_file_path - if not test_unit: - # This wrapper script is in bash and doesn't work on Windows - # where we want to run doctests as part of `./mach test-unit` - env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private') - elif "msvc" in servo.platform.host_triple(): + if test_unit and "msvc" in servo.platform.host_triple(): # on MSVC, we need some DLLs in the path. They were copied # in to the servo.exe build dir, so just point PATH to that. util.prepend_paths_to_env(env, "PATH", path.dirname(self.get_binary_path(False, False))) @@ -824,7 +820,7 @@ class CommandBase(object): self.features += ["media-" + media_stack] def run_cargo_build_like_command( - self, command, cargo_args, + self, command: str, cargo_args: List[str], env=None, verbose=False, libsimpleservo=False, debug_mozjs=False, with_debug_assertions=False, |