Skip to content

Intra doc enum variant field #66704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Nov 28, 2019
Merged

Intra doc enum variant field #66704

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4993807
little intra-doc code cleanup
GuillaumeGomez Nov 24, 2019
4ab8aa3
Add support for intra-doc link fields of enum variant
GuillaumeGomez Nov 24, 2019
b91a6fc
Replace Iterator::find calls with Iterator::any when better
GuillaumeGomez Nov 26, 2019
97c427c
Use new ErrorKind enum
GuillaumeGomez Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
little intra-doc code cleanup
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Nov 27, 2019
commit 4993807dd9416ed65b9cac0e507af34bfe04a4ad
27 changes: 11 additions & 16 deletions src/librustdoc/passes/collect_intra_doc_links.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,23 +121,18 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {

// Try looking for methods and associated items.
let mut split = path_str.rsplitn(2, "::");
let item_name = if let Some(first) = split.next() {
Symbol::intern(first)
} else {
return Err(ErrorKind::ResolutionFailure)
};

let mut path = if let Some(second) = split.next() {
second.to_owned()
} else {
return Err(ErrorKind::ResolutionFailure)
};

if path == "self" || path == "Self" {
if let Some(name) = current_item.as_ref() {
path = name.clone();
let item_name = split.next()
.map(|f| Symbol::intern(f))
.ok_or(ErrorKind::ResolutionFailure)?;
let path = split.next().map(|f| {
if f == "self" || f == "Self" {
if let Some(name) = current_item.as_ref() {
return name.clone();
}
}
}
f.to_owned()
}).ok_or(ErrorKind::ResolutionFailure)?;

if let Some(prim) = is_primitive(&path, TypeNS) {
let did = primitive_impl(cx, &path).ok_or(ErrorKind::ResolutionFailure)?;
return cx.tcx.associated_items(did)
Expand Down