Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/rustdoc-json/impls/blanket_with_local.rs b/tests/rustdoc-json/impls/blanket_with_local.rs
new file mode 100644
index 000000000..2fb4a84b9
--- /dev/null
+++ b/tests/rustdoc-json/impls/blanket_with_local.rs
@@ -0,0 +1,18 @@
+// Test for the ICE in rust/83718
+// A blanket impl plus a local type together shouldn't result in mismatched ID issues
+
+// @has "$.index[*][?(@.name=='Load')]"
+pub trait Load {
+    // @has "$.index[*][?(@.name=='load')]"
+    fn load() {}
+    // @has "$.index[*][?(@.name=='write')]"
+    fn write(self) {}
+}
+
+impl<P> Load for P {
+    fn load() {}
+    fn write(self) {}
+}
+
+// @has "$.index[*][?(@.name=='Wrapper')]"
+pub struct Wrapper {}