From 541fbbb6fab4afdeea48fdb9e94cee48991b3333 Mon Sep 17 00:00:00 2001
From: Gary Guo <gary@garyguo.net>
Date: Sat, 8 Aug 2020 01:07:43 +0100
Subject: [PATCH] Cross-crate doc inlining test case for elided lifetime

---
 src/test/rustdoc/auxiliary/elided-lifetime.rs | 11 ++++++++
 src/test/rustdoc/elided-lifetime.rs           | 25 ++++++++-----------
 2 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 src/test/rustdoc/auxiliary/elided-lifetime.rs

diff --git a/src/test/rustdoc/auxiliary/elided-lifetime.rs b/src/test/rustdoc/auxiliary/elided-lifetime.rs
new file mode 100644
index 0000000000000..4f2c93379d88e
--- /dev/null
+++ b/src/test/rustdoc/auxiliary/elided-lifetime.rs
@@ -0,0 +1,11 @@
+#![crate_name = "bar"]
+
+pub struct Ref<'a>(&'a u32);
+
+pub fn test5(a: &u32) -> Ref {
+    Ref(a)
+}
+
+pub fn test6(a: &u32) -> Ref<'_> {
+    Ref(a)
+}
diff --git a/src/test/rustdoc/elided-lifetime.rs b/src/test/rustdoc/elided-lifetime.rs
index 6ba58380ed593..5a32554f972b7 100644
--- a/src/test/rustdoc/elided-lifetime.rs
+++ b/src/test/rustdoc/elided-lifetime.rs
@@ -1,10 +1,12 @@
-#![crate_name = "foo"]
-
+// aux-build:elided-lifetime.rs
+//
 // rust-lang/rust#75225
 //
 // Since Rust 2018 we encourage writing out <'_> explicitly to make it clear
 // that borrowing is occuring. Make sure rustdoc is following the same idiom.
 
+#![crate_name = "foo"]
+
 pub struct Ref<'a>(&'a u32);
 type ARef<'a> = Ref<'a>;
 
@@ -32,15 +34,10 @@ pub fn test4(a: &u32) -> ARef<'_> {
     Ref(a)
 }
 
-// Ensure external paths also display elided lifetime
-// @has foo/fn.test5.html
-// @matches - "Iter</a>&lt;'_"
-pub fn test5(a: &Option<u32>) -> std::option::Iter<u32> {
-    a.iter()
-}
-
-// @has foo/fn.test6.html
-// @matches - "Iter</a>&lt;'_"
-pub fn test6(a: &Option<u32>) -> std::option::Iter<'_, u32> {
-    a.iter()
-}
+// Ensure external paths in inlined docs also display elided lifetime
+// @has foo/bar/fn.test5.html
+// @matches - "Ref</a>&lt;'_&gt;"
+// @has foo/bar/fn.test6.html
+// @matches - "Ref</a>&lt;'_&gt;"
+#[doc(inline)]
+pub extern crate bar;