Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Part of #43466.

Add intra-doc link support for this:

enum Foo {
    X {
        y: u8, // can be found with Foo::X::y
    }
}

r? @kinnison

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 24, 2019
let item = cx.tcx.inherent_impls(did)
.iter()
.flat_map(|imp| cx.tcx.associated_items(*imp))
.find(|item| item.ident.name == variant_name);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iter.find().is_some() could be written as iter.any()

match cx.tcx.type_of(did).kind {
ty::Adt(def, _) if def.is_enum() => {
if def.all_fields()
.find(|item| item.ident.name == variant_field_name).is_some() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too: use iter.any()

Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modulo the comments from @lzutao I think this looks good.

@GuillaumeGomez
Copy link
Member Author

Updated.

@bors
Copy link
Collaborator

bors commented Nov 27, 2019

☔ The latest upstream changes (presumably #66675) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez force-pushed the intra-doc-enum-variant-field branch from 85f7992 to e0bd51b Compare November 27, 2019 12:15
@GuillaumeGomez
Copy link
Member Author

Updated!

@GuillaumeGomez GuillaumeGomez force-pushed the intra-doc-enum-variant-field branch 2 times, most recently from 11c495f to a636d70 Compare November 27, 2019 12:54
@GuillaumeGomez GuillaumeGomez force-pushed the intra-doc-enum-variant-field branch from a636d70 to 97c427c Compare November 27, 2019 13:28
@GuillaumeGomez
Copy link
Member Author

Ok, fixed the invalid errors return. We can move forward...

@bors: r=kinnison

@bors
Copy link
Collaborator

bors commented Nov 27, 2019

📌 Commit 97c427c has been approved by kinnison

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 27, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 27, 2019
…nt-field, r=kinnison

Intra doc enum variant field

Part of rust-lang#43466.

Add intra-doc link support for this:

```rust
enum Foo {
    X {
        y: u8, // can be found with Foo::X::y
    }
}
```

r? @kinnison
bors added a commit that referenced this pull request Nov 27, 2019
Rollup of 17 pull requests

Successful merges:

 - #64325 (Stabilize nested self receivers in 1.41.0)
 - #66222 (Use `eq_opaque_type_and_type` when type-checking closure signatures)
 - #66305 (Add by-value arrays to `improper_ctypes` lint)
 - #66399 (rustc_metadata: simplify the interactions between Lazy and Table.)
 - #66534 (Allow global references via ForeignItem and Item for the same symbol name during LLVM codegen)
 - #66700 (Fix pointing at arg for fulfillment errors in function calls)
 - #66704 (Intra doc enum variant field)
 - #66718 (Refactor `parse_enum_item` to use `parse_delim_comma_seq`)
 - #66722 (Handle non_exhaustive in borrow checking)
 - #66744 (Fix shrink_to panic documentation)
 - #66761 (Use LLVMDisposePassManager instead of raw delete in rustllvm)
 - #66769 (Add core::{f32,f64}::consts::TAU.)
 - #66774 (Clean up error codes)
 - #66777 (Put back tidy check on error codes)
 - #66797 (Fixes small typo in array docs r? @steveklabnik)
 - #66798 (Fix spelling typos)
 - #66800 (Combine similar tests for const match)

Failed merges:

r? @ghost
@bors bors merged commit 97c427c into rust-lang:master Nov 28, 2019
@GuillaumeGomez GuillaumeGomez deleted the intra-doc-enum-variant-field branch November 28, 2019 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants