servo: Merge #6655 - Include private items in `./mach doc` and http://doc.servo.org/ (from servo:rustdoc-private); r=Manishearth

See https://github.com/rust-lang/rust/issues/15347

Source-Repo: https://github.com/servo/servo
Source-Revision: a24783df4be2641afab3aa72626f9c59f90d49af

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

servo/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',