From b905464668a5dbd51ea91c2766d5e764868ebf3e Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Sat, 9 Jul 2016 14:07:37 +0100 Subject: rustdoc: Fix methods in seach results Currently methods from extern crates are sometimes added to the search index when they shouldn't be or added with the original path rather than the reexported path. This fixes that by making sure `cache().paths` only contains local paths like the description for it states. It also fixes a few minor issues with link rendering and redirect generation which would point to local crate docs even if the docs for that crate hadn't been generated. Also a bug with methods implemented on traits which caused wrong paths and so dead links in the search results has been fixed. --- src/test/rustdoc/auxiliary/extern-links.rs | 11 +++++++++++ src/test/rustdoc/extern-links.rs | 31 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/test/rustdoc/auxiliary/extern-links.rs create mode 100644 src/test/rustdoc/extern-links.rs (limited to 'src/test/rustdoc') diff --git a/src/test/rustdoc/auxiliary/extern-links.rs b/src/test/rustdoc/auxiliary/extern-links.rs new file mode 100644 index 00000000000..94b7278e990 --- /dev/null +++ b/src/test/rustdoc/auxiliary/extern-links.rs @@ -0,0 +1,11 @@ +// Copyright 2016 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub struct Foo; diff --git a/src/test/rustdoc/extern-links.rs b/src/test/rustdoc/extern-links.rs new file mode 100644 index 00000000000..c35a5668dce --- /dev/null +++ b/src/test/rustdoc/extern-links.rs @@ -0,0 +1,31 @@ +// Copyright 2016 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// aux-build:extern-links.rs +// ignore-cross-compile + +#![crate_name = "foo"] + +extern crate extern_links; + +// @!has foo/index.html '//a' 'extern_links' +#[doc(no_inline)] +pub use extern_links as extern_links2; + +// @!has foo/index.html '//a' 'Foo' +#[doc(no_inline)] +pub use extern_links::Foo; + +#[doc(hidden)] +pub mod hidden { + // @!has foo/hidden/extern_links/index.html + // @!has foo/hidden/extern_links/struct.Foo.html + pub use extern_links; +} -- cgit 1.4.1-3-g733a5