about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-24 12:57:29 -0700
committerGitHub <noreply@github.com>2016-06-24 12:57:29 -0700
commitdc9112f65b10bd8dcbf59901a68b99985b493e64 (patch)
tree435cd5872bcfc2bc5eb52d8e5578a79d7326df57 /src/test
parent4b89debc7b776a947331dd0ceaa52ba8476157b2 (diff)
parent1efcde5de01880b5d0cd45bdaca699c0727f5976 (diff)
Auto merge of #34439 - ollie27:rustdoc_panic_fix, r=alexcrichton
rustdoc: Fix panic caused by doc(hidden) trait methods

Fixes: #34423

r? @alexcrichton
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/issue-34423.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/test/rustdoc/issue-34423.rs b/src/test/rustdoc/issue-34423.rs
new file mode 100644
index 00000000000..460462d8a66
--- /dev/null
+++ b/src/test/rustdoc/issue-34423.rs
@@ -0,0 +1,20 @@
+// 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 <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.
+
+pub struct Foo;
+
+pub trait Bar {
+    #[doc(hidden)]
+    fn bar() {}
+}
+
+impl Bar for Foo {
+    fn bar() {}
+}