---

yaml
---
r: 273057
b: refs/heads/beta
c: 27217e5
h: refs/heads/master
i:
  273055: ad27e4c

Author: eddyb

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: beb444eaed6b1b387538435e6eb99fa0cd0f0bed
+refs/heads/beta: 27217e580f387e4e0926aacd08703ef6e8a2bf91
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustdoc/visit_ast.rs

@@ -26,7 +26,6 @@ use rustc::middle::stability;
 use rustc_front::hir;
 
 use core;
-use clean::{Clean, Attributes};
 use doctree::*;
 
 // looks to me like the first two of these are actually
@@ -183,15 +182,15 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                        please_inline: bool) -> Option<hir::ViewPath_> {
         match path {
             hir::ViewPathSimple(dst, base) => {
-                if self.maybe_inline_local(id, Some(dst), false, om, please_inline) {
+                if self.resolve_id(id, Some(dst), false, om, please_inline) {
                     None
                 } else {
                     Some(hir::ViewPathSimple(dst, base))
                 }
             }
             hir::ViewPathList(p, paths) => {
                 let mine = paths.into_iter().filter(|path| {
-                    !self.maybe_inline_local(path.node.id(), None, false, om,
+                    !self.resolve_id(path.node.id(), None, false, om,
                                      please_inline)
                 }).collect::<hir::HirVec<hir::PathListItem>>();
 
@@ -202,8 +201,9 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                 }
             }
 
+            // these are feature gated anyway
             hir::ViewPathGlob(base) => {
-                if self.maybe_inline_local(id, None, true, om, please_inline) {
+                if self.resolve_id(id, None, true, om, please_inline) {
                     None
                 } else {
                     Some(hir::ViewPathGlob(base))
@@ -213,32 +213,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
 
     }
 
-    /// Tries to resolve the target of a `pub use` statement and inlines the
-    /// target if it is defined locally and would not be documented otherwise,
-    /// or when it is specifically requested with `please_inline`.
-    /// (the latter is the case when the import is marked `doc(inline)`)
-    ///
-    /// Cross-crate inlining occurs later on during crate cleaning
-    /// and follows different rules.
-    ///
-    /// Returns true if the target has been inlined.
-    fn maybe_inline_local(&mut self, id: ast::NodeId, renamed: Option<ast::Name>,
+    fn resolve_id(&mut self, id: ast::NodeId, renamed: Option<ast::Name>,
                   glob: bool, om: &mut Module, please_inline: bool) -> bool {
-
-        fn inherits_doc_hidden(cx: &core::DocContext, mut node: ast::NodeId) -> bool {
-            while let Some(id) = cx.map.get_enclosing_scope(node) {
-                node = id;
-                let attrs = cx.map.attrs(node).clean(cx);
-                if attrs.list_def("doc").has_word("hidden") {
-                    return true;
-                }
-                if node == ast::CRATE_NODE_ID {
-                    break;
-                }
-            }
-            false
-        }
-
         let tcx = match self.cx.tcx_opt() {
             Some(tcx) => tcx,
             None => return false
@@ -250,15 +226,9 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
         let analysis = match self.analysis {
             Some(analysis) => analysis, None => return false
         };
-
-        let is_private = !analysis.access_levels.is_public(def);
-        let is_hidden = inherits_doc_hidden(self.cx, def_node_id);
-
-        // Only inline if requested or if the item would otherwise be stripped
-        if !please_inline && !is_private && !is_hidden {
+        if !please_inline && analysis.access_levels.is_public(def) {
             return false
         }
-
         if !self.view_item_stack.insert(def_node_id) { return false }
 
         let ret = match tcx.map.get(def_node_id) {
@@ -306,10 +276,10 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
                 let node = if item.vis == hir::Public {
                     let please_inline = item.attrs.iter().any(|item| {
                         match item.meta_item_list() {
-                            Some(list) if &item.name()[..] == "doc" => {
+                            Some(list) => {
                                 list.iter().any(|i| &i.name()[..] == "inline")
                             }
-                            _ => false,
+                            None => false,
                         }
                     });
                     match self.visit_view_path(node, om, item.id, please_inline) {

branches/beta/src/test/run-pass/cci_nested_exe.rs

@@ -11,6 +11,8 @@
 // aux-build:cci_nested_lib.rs
 
 
+#![feature(globs)]
+
 extern crate cci_nested_lib;
 use cci_nested_lib::*;
 

branches/beta/src/test/run-pass/command-before-exec.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 // ignore-windows - this is a unix-specific test
+// no-prefer-dynamic - this test breaks with dynamic linking as
+// some LD_LIBRARY_PATH entries are relative and it cd's to /.
 
 #![feature(process_exec, libc)]
 

branches/beta/src/test/rustdoc/inline_local/issue-28537.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 #![crate_type = "lib"]
+#![feature(globs)]
 
 mod m {
     pub use self::a::Foo;

branches/beta/src/test/rustdoc/inline_local/please_inline.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 #![crate_type = "lib"]
+#![feature(globs)]
 
 mod m {
     pub use self::a::Foo;

branches/beta/src/test/rustdoc/recursion1.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(globs)]
+
 pub mod longhands {
     pub use super::*;