From d96f0ff6a77e309682898cc7e1905a7bd0feb3cf Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 22 Nov 2017 15:32:40 +0100 Subject: [PATCH] Use rustdoc --document-private-item instead of deprecated flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … and use $RUSTDOCFLAGS instead of $RUSTDOC with a wrapper script --- etc/rustdoc-with-private | 4 ---- python/servo/command_base.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100755 etc/rustdoc-with-private diff --git a/etc/rustdoc-with-private b/etc/rustdoc-with-private deleted file mode 100755 index 097c237c5623..000000000000 --- a/etc/rustdoc-with-private +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Skip the strip-private and strip-hidden rustdoc passes -# https://github.com/rust-lang/rust/issues/15347 -rustdoc --no-defaults --passes collapse-docs --passes unindent-comments --passes strip-priv-imports "$@" diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 09ab3f911c60..4b29b25daf6f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -486,7 +486,7 @@ def package_dir(package): if hosts_file_path: env['HOST_FILE'] = hosts_file_path - env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private') + env['RUSTDOCFLAGS'] = "--document-private-items" if self.config["build"]["rustflags"]: env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " " + self.config["build"]["rustflags"]