Fix Alias intra doc ICE #52835

GuillaumeGomez · 2018-07-29T22:09:14Z

varkor · 2018-07-29T22:16:22Z

src/librustdoc/clean/mod.rs

-                              .find(|item| item.ident.name == item_name)
+                    let elem = match cx.tcx.type_of(did).sty {
+                        ty::TyAdt(def, _) => {
+                            if is_enum {


You don't even need to switch on is_enum here: def.all_fields() should work in general.

varkor · 2018-07-29T22:18:35Z

src/librustdoc/clean/mod.rs

-                              .fields
-                              .iter()
-                              .find(|item| item.ident.name == item_name)
+                    let elem = match cx.tcx.type_of(did).sty {


Instead of storing elem and then matching on it, you might as well subsume the if-else below into this match, because you only return Ok if it's a TyAdt.

You can also then use def.is_enum() directly instead of matching on ty.def.

varkor · 2018-07-29T22:20:14Z

r=me after the minor comments are addressed.

GuillaumeGomez · 2018-07-30T18:57:44Z

Updated.

GuillaumeGomez · 2018-07-30T20:42:09Z

@bors: r=varkor

bors · 2018-07-30T20:42:11Z

📌 Commit d5f1f70 has been approved by varkor

@QuietMisdreavus

…=varkor Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

eddyb · 2018-07-31T08:13:34Z

src/librustdoc/clean/mod.rs

+                                Ok((ty.def,
+                                    Some(format!("{}.{}",
+                                                 if def.is_enum() {
+                                                     "variant"


Don't think this is correct, it won't find variants... unless you want fields? This is confusing. Although, not any more wrong than before I guess.

So we need the differentiation between .non_enum_variant() and .all_fields()?

The issue is that in this code (and before), you're iterating over the fields (of a struct, enum, etc.), but if it's an enum, you're calling the result "variant" (when it's more accurately an "enumfield" or something). The question is whether you actually want fields or variants for enums. If you want fields, you should rename the string, but if you actually are looking for variants, you should be iterating over variants if it's an enum, rather than all_fields().

I'm not sure what exactly you're looking for here, tbh.

If the type has a field or a variant with a given name.

GuillaumeGomez · 2018-07-31T08:17:32Z

@bors: r-

GuillaumeGomez · 2018-07-31T19:43:58Z

Updated.

eddyb · 2018-07-31T20:34:11Z

@bors r+ (the variant thing is still broken but at least exactly as broken as before AFAICT)

GuillaumeGomez · 2018-07-31T20:46:56Z

Seems like bors doesn't like comments?

@bors: r=eddyb

bors · 2018-07-31T20:46:56Z

📌 Commit d94bdf8 has been approved by eddyb

@QuietMisdreavus

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

varkor · 2018-08-01T00:16:30Z

src/librustdoc/clean/mod.rs

-                            if let Some(item) = def.all_fields()
-                                                   .find(|item| item.ident.name == item_name) {
+                            if let Some(item) = if def.is_enum() {
+                                def.all_fields().find(|item| item.ident.name == item_name)


This isn't a change that needed to be reverted, unless you wanted to iterate through def.variants here instead of def.all_fields().

Yes indeed!

@QuietMisdreavus

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

@ghost

Rollup of 31 pull requests Successful merges: - #52332 (dead-code lint: say "constructed" for structs) - #52340 (Document From trait implementations for OsStr, OsString, CString, and CStr) - #52628 (Cleanup some rustdoc code) - #52732 (Remove unstable and deprecated APIs) - #52745 (Update clippy to latest master) - #52756 (rustc: Disallow machine applicability in foreign macros) - #52771 (Clarify thread::park semantics) - #52810 ([NLL] Don't make "fake" match variables mutable) - #52821 (pretty print for std::collections::vecdeque) - #52822 (Fix From<LocalWaker>) - #52824 (Fix -Wpessimizing-move warnings in rustllvm/PassWrapper) - #52831 (remove references to AUTHORS.txt file) - #52835 (Fix Alias intra doc ICE) - #52842 (update comment) - #52846 (Add timeout to use of `curl` in bootstrap.py.) - #52851 (Make the tool_lints actually usable) - #52853 (Improve bootstrap help on stages) - #52859 (Use Vec::extend in SmallVec::extend when applicable) - #52861 (Add targets for HermitCore (https://hermitcore.org) to the Rust compiler and port libstd to it.) - #52867 (releases.md: fix 2 typos) - #52870 (Implement Unpin for FutureObj and LocalFutureObj) - #52876 (run-pass/const-endianness: negate before to_le()) - #52878 (Fix wrong issue number in the test name) - #52883 (Include lifetime in mutability suggestion in NLL messages) - #52904 (NLL: sort diagnostics by span) - #52905 (Fix a typo in unsize.rs) - #52907 (NLL: On "cannot move out of type" error, print original before rewrite) - #52908 (Use SetLenOnDrop in Vec::truncate()) - #52914 (Only run the sparc-abi test on sparc) - #52918 (Backport 1.27.2 release notes) - #52929 (Update compatibility note for 1.28.0 to be correct) Failed merges: - #52758 (Cleanup for librustc::session) - #52799 (Use BitVector for global sets of AttrId) r? @ghost

@QuietMisdreavus

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

@QuietMisdreavus

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

@ghost

Rollup of 15 pull requests Successful merges: - #52793 (Add test for NLL: unexpected "free region `` does not outlive" error ) - #52799 (Use BitVector for global sets of AttrId) - #52809 (Add test for unexpected region for local data ReStatic) - #52834 ([NLL] Allow conflicting borrows of promoted length zero arrays) - #52835 (Fix Alias intra doc ICE) - #52854 (fix memrchr in miri) - #52899 (tests/ui: Add missing mips{64} ignores) - #52908 (Use SetLenOnDrop in Vec::truncate()) - #52915 (Don't count MIR locals as borrowed after StorageDead when finding locals live across a yield terminator) - #52926 (rustc: Trim down the `rust_2018_idioms` lint group) - #52930 (rustc_resolve: record single-segment extern crate import resolutions.) - #52939 (Make io::Read::read_to_end consider io::Take::limit) - #52942 (Another SmallVec.extend optimization) - #52947 (1.27 actually added the `armv5te-unknown-linux-musleabi` target) - #52954 (async can begin expressions) Failed merges: r? @ghost

rust-highfive assigned varkor Jul 29, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 29, 2018

GuillaumeGomez force-pushed the ice-rustdoc-links branch from 956299e to bd7aea4 Compare July 29, 2018 22:09

varkor reviewed Jul 29, 2018

View reviewed changes

Fix Alias intra doc ICE

d5f1f70

GuillaumeGomez force-pushed the ice-rustdoc-links branch from bd7aea4 to d5f1f70 Compare July 30, 2018 18:57

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 Jul 30, 2018

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 30, 2018

Rollup merge of rust-lang#52835 - GuillaumeGomez:ice-rustdoc-links, r…

9c10b79

…=varkor Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

Mark-Simulacrum mentioned this pull request Jul 30, 2018

Rollup of 22 pull requests #52882

Closed

eddyb reviewed Jul 31, 2018

View reviewed changes

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2018

Put back original field discovery

d94bdf8

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 31, 2018

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 31, 2018

Rollup merge of rust-lang#52835 - GuillaumeGomez:ice-rustdoc-links, r…

0771d56

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

GuillaumeGomez mentioned this pull request Jul 31, 2018

Rollup of 20 pull requests #52916

Closed

varkor reviewed Aug 1, 2018

View reviewed changes

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 1, 2018

Rollup merge of rust-lang#52835 - GuillaumeGomez:ice-rustdoc-links, r…

bc721a1

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

Mark-Simulacrum mentioned this pull request Aug 1, 2018

Rollup of 31 pull requests #52931

Closed

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 1, 2018

Rollup merge of rust-lang#52835 - GuillaumeGomez:ice-rustdoc-links, r…

ad91686

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

Mark-Simulacrum mentioned this pull request Aug 1, 2018

Rollup of 8 pull requests #52944

Closed

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 1, 2018

Rollup merge of rust-lang#52835 - GuillaumeGomez:ice-rustdoc-links, r…

f52ef3b

…=eddyb Fix Alias intra doc ICE Fixes rust-lang#52611. cc @QuietMisdreavus r? @varkor

pietroalbini mentioned this pull request Aug 1, 2018

Rollup of 15 pull requests #52958

Merged

bors merged commit d94bdf8 into rust-lang:master Aug 1, 2018

GuillaumeGomez deleted the ice-rustdoc-links branch August 2, 2018 08:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Alias intra doc ICE #52835

Fix Alias intra doc ICE #52835

GuillaumeGomez commented Jul 29, 2018

varkor Jul 29, 2018

varkor Jul 29, 2018

varkor commented Jul 29, 2018

GuillaumeGomez commented Jul 30, 2018

GuillaumeGomez commented Jul 30, 2018

bors commented Jul 30, 2018

eddyb Jul 31, 2018

GuillaumeGomez Jul 31, 2018

varkor Jul 31, 2018

eddyb Jul 31, 2018

GuillaumeGomez Jul 31, 2018

GuillaumeGomez commented Jul 31, 2018

GuillaumeGomez commented Jul 31, 2018

eddyb commented Jul 31, 2018

GuillaumeGomez commented Jul 31, 2018

bors commented Jul 31, 2018

varkor Aug 1, 2018

GuillaumeGomez Aug 1, 2018

Fix Alias intra doc ICE #52835

Fix Alias intra doc ICE #52835

Conversation

GuillaumeGomez commented Jul 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

varkor commented Jul 29, 2018

GuillaumeGomez commented Jul 30, 2018

GuillaumeGomez commented Jul 30, 2018

bors commented Jul 30, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented Jul 31, 2018

GuillaumeGomez commented Jul 31, 2018

eddyb commented Jul 31, 2018

GuillaumeGomez commented Jul 31, 2018

bors commented Jul 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment