summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-06-28 18:34:26 +0200
committerGitHub <noreply@github.com>2022-06-28 18:34:26 +0200
commit3991e739ba1adc8bf7f7a457fc362c2658b8db36 (patch)
tree613514a1b5621beaa4647dacf060e3b44b33783f
parent00ebeb87ac87a492bd59ace6bd43d6ad1629ca4e (diff)
parent2888e76d06483e505bf4956a08bc24d4e7764beb (diff)
downloadrust-3991e739ba1adc8bf7f7a457fc362c2658b8db36.tar.gz
Rollup merge of #98548 - Enselic:allow-typedef-diff-for-rustdoc-json, r=GuillaumeGomez
rustdoc-json: Allow Typedef to be different in sanity assert Closes #98547 This fix is a natural extension of #98053. r? `@notriddle` (Since you reviewed the other PR.) CC `@GuillaumeGomez` `@rustbot` labels +A-rustdoc-json +T-rustdoc
-rw-r--r--src/test/rustdoc-json/assoc_type.rs22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/test/rustdoc-json/assoc_type.rs b/src/test/rustdoc-json/assoc_type.rs
new file mode 100644
index 00000000000..716bb3d2848
--- /dev/null
+++ b/src/test/rustdoc-json/assoc_type.rs
@@ -0,0 +1,22 @@
+// Regression test for <https://github.com/rust-lang/rust/issues/98547>.
+
+// @has assoc_type.json
+// @has - "$.index[*][?(@.name=='Trait')]"
+// @has - "$.index[*][?(@.name=='AssocType')]"
+// @has - "$.index[*][?(@.name=='S')]"
+// @has - "$.index[*][?(@.name=='S2')]"
+
+pub trait Trait {
+ type AssocType;
+}
+
+impl<T> Trait for T {
+ type AssocType = Self;
+}
+
+pub struct S;
+
+/// Not needed for the #98547 ICE to occur, but added to maximize the chance of
+/// getting an ICE in the future. See
+/// <https://github.com/rust-lang/rust/pull/98548#discussion_r908219164>
+pub struct S2;