From d7fcee8347dd9dc7e51bff55291f928d0cb0b2e7 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 7 Apr 2015 11:50:14 -0700
Subject: rustdoc: Detect provided methods on inlined traits

Closes #23864
---
 src/test/rustdoc/extern-method.rs          |  2 +-
 src/test/rustdoc/inline-default-methods.rs | 18 ++++++++++++++++++
 src/test/rustdoc/issue-17476.rs            |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/test/rustdoc/inline-default-methods.rs

(limited to 'src/test/rustdoc')

diff --git a/src/test/rustdoc/extern-method.rs b/src/test/rustdoc/extern-method.rs
index ff92adf08c1..2943bd8507b 100644
--- a/src/test/rustdoc/extern-method.rs
+++ b/src/test/rustdoc/extern-method.rs
@@ -16,7 +16,7 @@ extern crate rustdoc_extern_method as foo;
 
 // @has extern_method/trait.Foo.html //pre "pub trait Foo"
 // @has - '//*[@id="tymethod.foo"]//code' 'extern "rust-call" fn foo'
-// @has - '//*[@id="tymethod.foo_"]//code' 'extern "rust-call" fn foo_'
+// @has - '//*[@id="method.foo_"]//code' 'extern "rust-call" fn foo_'
 pub use foo::Foo;
 
 // @has extern_method/trait.Bar.html //pre "pub trait Bar"
diff --git a/src/test/rustdoc/inline-default-methods.rs b/src/test/rustdoc/inline-default-methods.rs
new file mode 100644
index 00000000000..5e958e333bb
--- /dev/null
+++ b/src/test/rustdoc/inline-default-methods.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 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.
+
+// aux-build:inline-default-methods.rs
+
+extern crate inline_default_methods;
+
+// @has inline_default_methods/trait.Foo.html
+// @has - '//*[@class="rust trait"]' 'fn bar(&self);'
+// @has - '//*[@class="rust trait"]' 'fn foo(&mut self) { ... }'
+pub use inline_default_methods::Foo;
diff --git a/src/test/rustdoc/issue-17476.rs b/src/test/rustdoc/issue-17476.rs
index cb224d66b44..069422171bd 100644
--- a/src/test/rustdoc/issue-17476.rs
+++ b/src/test/rustdoc/issue-17476.rs
@@ -15,6 +15,6 @@ extern crate issue_17476;
 pub struct Foo;
 
 // @has issue_17476/struct.Foo.html \
-//      '//*[@href="http://example.com/issue_17476/trait.Foo.html#tymethod.foo"]' \
+//      '//*[@href="http://example.com/issue_17476/trait.Foo.html#method.foo"]' \
 //      'foo'
 impl issue_17476::Foo for Foo {}
-- 
cgit 1.4.1-3-g733a5