user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustdoc: Don't try to inline the crate root

Browse source 
Fixes other test cases found in #16274
This commit is contained in:
Alex Crichton 2014-09-23 15:19:30 -07:00
parent d2b30f7d38
commit 3d8ca595a1
5 changed files with 57 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/run-make/rustdoc-recursion/Makefile
View file

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

2
src/test/run-make/rustdoc-recursion/foo.rs
View file

@ -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.
//

24
src/test/run-make/rustdoc-recursion/foo2.rs Normal file
View file

@ -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::*;
}
}

25
src/test/run-make/rustdoc-recursion/foo3.rs Normal file
View file

@ -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;
}
}