mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove span method from AttributesExt trait

Browse Source
This commit is contained in:
Guillaume Gomez 2023-03-23 17:37:29 +01:00
parent de61a789af
commit 87ea9941d5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustdoc/clean/types.rs
View File

@ -878,10 +878,6 @@ pub(crate) trait AttributesExt {
fn iter<'a>(&'a self) -> Self::Attributes<'a>; fn iter<'a>(&'a self) -> Self::Attributes<'a>;
fn span(&self) -> Option<rustc_span::Span> {
self.iter().find(|attr| attr.doc_str().is_some()).map(|attr| attr.span)
}
fn cfg(&self, tcx: TyCtxt<'_>, hidden_cfg: &FxHashSet<Cfg>) -> Option<Arc<Cfg>> { fn cfg(&self, tcx: TyCtxt<'_>, hidden_cfg: &FxHashSet<Cfg>) -> Option<Arc<Cfg>> {
let sess = tcx.sess; let sess = tcx.sess;
let doc_cfg_active = tcx.features().doc_cfg; let doc_cfg_active = tcx.features().doc_cfg;

5
src/librustdoc/doctest.rs
View File

@ -1239,8 +1239,9 @@ impl<'a, 'hir, 'tcx> HirCollector<'a, 'hir, 'tcx> {
if let Some(doc) = attrs.collapsed_doc_value() { if let Some(doc) = attrs.collapsed_doc_value() {
// Use the outermost invocation, so that doctest names come from where the docs were written. // Use the outermost invocation, so that doctest names come from where the docs were written.
let span = ast_attrs let span = ast_attrs
.span() .iter()
.map(|span| span.ctxt().outer_expn().expansion_cause().unwrap_or(span)) .find(|attr| attr.doc_str().is_some())
.map(|attr| attr.span.ctxt().outer_expn().expansion_cause().unwrap_or(attr.span))
.unwrap_or(DUMMY_SP); .unwrap_or(DUMMY_SP);
self.collector.set_position(span); self.collector.set_position(span);
markdown::find_testable_code( markdown::find_testable_code(