about summary refs log tree commit diff
path: root/src/test/rustdoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-27 13:51:25 +0000
committerbors <bors@rust-lang.org>2019-09-27 13:51:25 +0000
commita37fe2de697bb1a9d304e4e811836e125f944cd5 (patch)
tree132fc6b9457757b05fac04d093c9d42c7e63323c /src/test/rustdoc
parent590ae0ec4d0c782f7cf97cff7474dc4012c1b615 (diff)
parent143b83a3c1e3a03d9795b891e4f2298c5e59f66a (diff)
downloadrust-a37fe2de697bb1a9d304e4e811836e125f944cd5.tar.gz
rust-a37fe2de697bb1a9d304e4e811836e125f944cd5.zip
Auto merge of #63937 - Nashenas88:rustdoc_57180, r=GuillaumeGomez
 Fix ICE in rustdoc when merging generic and where bounds of an Fn with an output

Fixes #57180
Diffstat (limited to 'src/test/rustdoc')
-rw-r--r--src/test/rustdoc/auxiliary/issue-57180.rs16
-rw-r--r--src/test/rustdoc/issue-57180.rs7
2 files changed, 23 insertions, 0 deletions
diff --git a/src/test/rustdoc/auxiliary/issue-57180.rs b/src/test/rustdoc/auxiliary/issue-57180.rs
new file mode 100644
index 00000000000..4e2f4b87c02
--- /dev/null
+++ b/src/test/rustdoc/auxiliary/issue-57180.rs
@@ -0,0 +1,16 @@
+// compile-flags: -Cmetadata=aux
+
+pub trait Trait {
+}
+
+pub struct Struct<F>
+{
+    _p: ::std::marker::PhantomData<F>,
+}
+
+impl<F: Fn() -> u32>
+Trait for Struct<F>
+    where
+        F: Fn() -> u32,
+{
+}
diff --git a/src/test/rustdoc/issue-57180.rs b/src/test/rustdoc/issue-57180.rs
new file mode 100644
index 00000000000..14bd2b0fec0
--- /dev/null
+++ b/src/test/rustdoc/issue-57180.rs
@@ -0,0 +1,7 @@
+// aux-build:issue-57180.rs
+
+extern crate issue_57180;
+use issue_57180::Trait;
+
+fn main() {
+}