1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/rustc_macros/src/query.rs b/compiler/rustc_macros/src/query.rs
index 2a1bb10fdfc..046a144913e 100644
--- a/compiler/rustc_macros/src/query.rs
+++ b/compiler/rustc_macros/src/query.rs
@@ -344,7 +344,6 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 #name,
             });
         }
-        all_names.extend(quote! { #name, });
 
         let mut attributes = Vec::new();
 
@@ -394,13 +393,18 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
         // be very useful.
         let span = name.span();
         let attribute_stream = quote_spanned! {span=> #(#attributes),*};
-        let doc_comments = query.doc_comments.iter();
+        let doc_comments = &query.doc_comments;
         // Add the query to the group
         query_stream.extend(quote! {
             #(#doc_comments)*
             [#attribute_stream] fn #name(#arg) #result,
         });
 
+        all_names.extend(quote! {
+            #(#doc_comments)*
+            #name,
+        });
+
         add_query_description_impl(&query, &mut query_description_stream);
     }