Correctly handle doc(test(attr(...)))

Author: GuillaumeGomez

Cargo.lock

@@ -4867,9 +4867,9 @@ dependencies = [
  "indexmap",
  "itertools",
  "minifier",
+ "proc-macro2",
  "pulldown-cmark-escape",
  "regex",
- "rustc_proc_macro",
  "rustdoc-json-types",
  "serde",
  "serde_json",

compiler/rustc_attr_parsing/src/attributes/doc.rs

@@ -115,9 +115,9 @@ impl DocParser {
                     return;
                 };
 
-                // FIXME: convert list into a Vec of `AttributeKind`.
-                for _ in list.mixed() {
-                    // self.attribute.test_attrs.push(AttributeKind::parse());
+                // FIXME: convert list into a Vec of `AttributeKind` because current code is awful.
+                for attr in list.mixed() {
+                    self.attribute.test_attrs.push(attr.span());
                 }
             }
             Some(name) => {

src/librustdoc/Cargo.toml

@@ -15,10 +15,10 @@ base64 = "0.21.7"
 indexmap = { version = "2", features = ["serde"] }
 itertools = "0.12"
 minifier = { version = "0.3.5", default-features = false }
+proc-macro2 = "1.0.103"
 pulldown-cmark-escape = { version = "0.11.0", features = ["simd"] }
 regex = "1"
 rustdoc-json-types = { path = "../rustdoc-json-types" }
-rustc_proc_macro = { path = "../../compiler/rustc_proc_macro" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 smallvec = "1.8.1"

src/librustdoc/doctest.rs

@@ -17,6 +17,7 @@ use std::{panic, str};
 
 pub(crate) use make::{BuildDocTestBuilder, DocTestBuilder};
 pub(crate) use markdown::test as test_markdown;
+use proc_macro2::{TokenStream, TokenTree};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxHasher, FxIndexMap, FxIndexSet};
 use rustc_errors::emitter::HumanReadableErrorType;
 use rustc_errors::{ColorConfig, DiagCtxtHandle};
@@ -25,7 +26,6 @@ use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::{Attribute, CRATE_HIR_ID};
 use rustc_interface::interface;
 use rustc_middle::ty::TyCtxt;
-use rustc_proc_macro::{TokenStream, TokenTree};
 use rustc_session::config::{self, CrateType, ErrorOutputType, Input};
 use rustc_session::lint;
 use rustc_span::edition::Edition;

src/librustdoc/doctest/rust.rs

@@ -5,12 +5,12 @@ use std::env;
 use std::str::FromStr;
 use std::sync::Arc;
 
+use proc_macro2::{TokenStream, TokenTree};
 use rustc_hir::attrs::AttributeKind;
 use rustc_hir::def_id::{CRATE_DEF_ID, LocalDefId};
 use rustc_hir::{self as hir, Attribute, CRATE_HIR_ID, intravisit};
 use rustc_middle::hir::nested_filter;
 use rustc_middle::ty::TyCtxt;
-use rustc_proc_macro::{TokenStream, TokenTree};
 use rustc_resolve::rustdoc::span_of_fragments;
 use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos, DUMMY_SP, FileName, Pos, Span};