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 -->
This commit is contained in:
bors-servo 2015-07-17 08:40:27 -06:00
commit a24783df4b
2 changed files with 7 additions and 1 deletions

4
etc/rustdoc-with-private Executable file
View file

@ -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" "$@"

View file

@ -156,8 +156,10 @@ class MachCommands(CommandBase):
else: else:
copy2(full_name, destination) copy2(full_name, destination)
env = self.build_env()
env['RUSTDOC'] = '../../etc/rustdoc-with-private'
return subprocess.call(["cargo", "doc"] + params, return subprocess.call(["cargo", "doc"] + params,
env=self.build_env(), cwd=self.servo_crate()) env=env, cwd=self.servo_crate())
@Command('browse-doc', @Command('browse-doc',
description='Generate documentation and open it in a web browser', description='Generate documentation and open it in a web browser',