Skip to content

Commit 401b9df

Browse files
committed
---
yaml --- r: 139016 b: refs/heads/try2 c: c724dae h: refs/heads/master v: v3
1 parent 7242e93 commit 401b9df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: a49ccee68efc7ec05e882e5929669108f65f74fa
8+
refs/heads/try2: c724dae7def417cd9aea8710d479b28155ed0f4f
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/core.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Implicitly, all crates behave as if they included the following prologue:
5656

5757
// On Linux, link to the runtime with -lrt.
5858
#[cfg(target_os = "linux")]
59+
#[doc(hidden)]
5960
pub mod linkhack {
6061
#[link_args="-lrustrt -lrt"]
6162
#[link_args = "-lpthread"]
@@ -252,7 +253,7 @@ pub mod rt;
252253
// A curious inner-module that's not exported that contains the binding
253254
// 'core' so that macro-expanded references to core::error and such
254255
// can be resolved within libcore.
255-
#[doc(hidden)] // FIXME #3538
256+
#[doc(hidden)]
256257
pub mod core {
257258
#[cfg(stage0)]
258259
pub const error : u32 = 1_u32;

branches/try2/src/librustdoc/rustdoc.rc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ fn run(config: Config) {
116116
// Remove things marked doc(hidden)
117117
prune_hidden_pass::mk_pass(),
118118
// Remove things that are private
119-
// XXX enable this after 'export' is removed in favor of 'pub'
120-
// prune_private_pass::mk_pass(),
119+
prune_private_pass::mk_pass(),
121120
// Extract brief documentation from the full descriptions
122121
desc_to_brief_pass::mk_pass(),
123122
// Massage the text to remove extra indentation

0 commit comments

Comments
 (0)