rustdoc: Don't try to inline the crate root
Fixes other test cases found in #16274
This commit is contained in:
parent
d2b30f7d38
commit
3d8ca595a1
|
@ -46,12 +46,15 @@ pub struct RustdocVisitor<'a, 'tcx: 'a> {
|
|||
impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
|
||||
pub fn new(cx: &'a core::DocContext<'tcx>,
|
||||
analysis: Option<&'a core::CrateAnalysis>) -> RustdocVisitor<'a, 'tcx> {
|
||||
// If the root is reexported, terminate all recursion.
|
||||
let mut stack = HashSet::new();
|
||||
stack.insert(ast::CRATE_NODE_ID);
|
||||
RustdocVisitor {
|
||||
module: Module::new(None),
|
||||
attrs: Vec::new(),
|
||||
cx: cx,
|
||||
analysis: analysis,
|
||||
view_item_stack: HashSet::new(),
|
||||
view_item_stack: stack,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -232,7 +235,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
|
|||
if !please_inline && analysis.public_items.contains(&def.node) {
|
||||
return false
|
||||
}
|
||||
if !self.view_item_stack.insert(id) { return false }
|
||||
if !self.view_item_stack.insert(def.node) { return false }
|
||||
|
||||
let ret = match tcx.map.get(def.node) {
|
||||
ast_map::NodeItem(it) => {
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
ifndef IS_WINDOWS
|
||||
all:
|
||||
$(HOST_RPATH_ENV) $(RUSTDOC) -w html -o $(TMPDIR)/doc foo.rs
|
||||
$(HOST_RPATH_ENV) $(RUSTDOC) -w html -o $(TMPDIR)/doc foo2.rs
|
||||
$(HOST_RPATH_ENV) $(RUSTDOC) -w html -o $(TMPDIR)/doc foo3.rs
|
||||
else
|
||||
all:
|
||||
endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
|
||||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![crate_type = "lib"]
|
||||
#![feature(globs)]
|
||||
|
||||
mod m {
|
||||
pub use self::a::Foo;
|
||||
|
||||
mod a {
|
||||
pub struct Foo;
|
||||
}
|
||||
|
||||
mod b {
|
||||
pub use super::*;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,25 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![feature(globs)]
|
||||
|
||||
pub mod longhands {
|
||||
pub use super::*;
|
||||
|
||||
pub use super::common_types::computed::compute_CSSColor as to_computed_value;
|
||||
|
||||
pub fn computed_as_specified() {}
|
||||
}
|
||||
|
||||
pub mod common_types {
|
||||
pub mod computed {
|
||||
pub use super::super::longhands::computed_as_specified as compute_CSSColor;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue