diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-17 08:40:27 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-17 08:40:27 -0600 |
| commit | a24783df4be2641afab3aa72626f9c59f90d49af (patch) | |
| tree | d3f219c53e7cad53426ec7a6ce9e5aabfc075604 | |
| parent | acf47a02cf38b5c82e7c78cc1f6660a7daa9969a (diff) | |
| parent | c85bfe13506237077d4883884388bc9be5b41633 (diff) | |
| download | servo-a24783df4be2641afab3aa72626f9c59f90d49af.tar.gz servo-a24783df4be2641afab3aa72626f9c59f90d49af.zip | |
Auto merge of #6655 - servo:rustdoc-private, r=Manishearth
Include private items in `./mach doc` and http://doc.servo.org/
See https://github.com/rust-lang/rust/issues/15347
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6655)
<!-- Reviewable:end -->
| -rwxr-xr-x | etc/rustdoc-with-private | 4 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/etc/rustdoc-with-private b/etc/rustdoc-with-private new file mode 100755 index 00000000000..770469ac064 --- /dev/null +++ b/etc/rustdoc-with-private @@ -0,0 +1,4 @@ +#!/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 unindent-comments" "$@" diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index efa315158f8..fbeec5a6193 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -156,8 +156,10 @@ class MachCommands(CommandBase): else: copy2(full_name, destination) + env = self.build_env() + env['RUSTDOC'] = '../../etc/rustdoc-with-private' return subprocess.call(["cargo", "doc"] + params, - env=self.build_env(), cwd=self.servo_crate()) + env=env, cwd=self.servo_crate()) @Command('browse-doc', description='Generate documentation and open it in a web browser', |