Make impl consts ConstantItems not AssocConstItems, to match typedefs #83665

CraftSpider · 2021-03-29T22:52:58Z

Fixes #81340. Draft as I'm not sure all tests will pass, running some of them locally isn't yet easy for me.

CraftSpider · 2021-03-30T00:04:50Z

The expected failures from HTML, I see where the problem is and think I know how to fix it

CraftSpider · 2021-05-08T02:05:02Z

Added test for JSON but not HTML, as HTML tests seem to already thoroughly cover this. Wasn't too bad once I just sat down and worked on it for a bit. So, assuming tests pass here as they did locally...

r? @jyn514

CraftSpider · 2021-05-08T02:05:54Z

@rustbot label: +A-rustdoc-json +A-rustdoc +S-waiting-on-review

rust-log-analyzer · 2021-05-08T03:01:52Z

The job x86_64-gnu-llvm-10 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"]
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 33 tests
iiiiiiiiiiiiiiiiiiiiiiiiiiiii....

 finished in 0.180 seconds
Suite("src/test/incremental") not skipped for "bootstrap::test::Incremental" -- not in ["src/tools/tidy"]
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"]
Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 116 tests
iiiiiiiiii.i.i..i..i..ii......ii...ii..........iiii.........i.....i...i.......ii.i.ii.....iiii.....i 100/116
test result: ok. 78 passed; 0 failed; 38 ignored; 0 measured; 0 filtered out; finished in 2.52s

 finished in 2.589 seconds
Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"]
---
---- [js-doc-test] rustdoc-js/doc-alias.rs stdout ----

error: rustdoc-js test failed!
status: exit status: 1
command: "/usr/bin/node" "/checkout/src/tools/rustdoc-js/tester.js" "--doc-folder" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-js/doc-alias" "--crate-name" "doc_alias" "--test-file" "/checkout/src/test/rustdoc-js/doc-alias.js"
------------------------------------------
Checking "doc-alias" ... FAILED
Checking "doc-alias" ... FAILED
[ query `StructImplConstItem`]==> Result not found in 'others': '{"path":"doc_alias::Struct","name":"ImplConstItem","alias":"StructImplConstItem","href":"../doc_alias/struct.Struct.html#associatedconstant.ImplConstItem","is_alias":true}'
Diff of first error:
 {
-     "path": "doc_alias::Struct",
+     "path": "doc_alias",
     "name": "ImplConstItem",
     "alias": "StructImplConstItem",
-     "href": "../doc_alias/struct.Struct.html#associatedconstant.ImplConstItem",
+     "href": "../doc_alias/constant.ImplConstItem.html",
     "is_alias": "true",

------------------------------------------
stderr:
------------------------------------------
---
test result: FAILED. 11 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.95s



command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/rustdoc-js" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-js" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--suite" "rustdoc-js" "--mode" "js-doc-test" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-10/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "10.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcerror orcjit passes perfjitevents powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --exclude src/tools/tidy
Build completed unsuccessfully in 0:33:04

CraftSpider · 2021-05-08T04:12:05Z

Hm, the failing test is actually kind of weird, looking at it: It expects the trait impl const to be in the search index, and the method, but not the typedef. Which would have the same issue as the const is now having: There doesn't seem to be a way to have the index link to a different type than the impl actually is

jyn514 · 2021-05-09T02:58:03Z

I don't have time to review this.

r? @GuillaumeGomez

CraftSpider · 2021-05-09T03:34:03Z

👍, for status: I need advice on what to do with the test. The current tests seem to not have the same issue with impl types being typedefs because they just don't add those to the index, or at least don't test it. So it looks like I'll have to make changes to how indexing works, unless we accept losing indexing of const impls

GuillaumeGomez · 2021-05-09T11:33:14Z

src/librustdoc/clean/mod.rs

-                }
+                hir::ImplItemKind::Const(ref ty, expr) => ConstantItem(Constant {
+                    type_: ty.clean(cx),
+                    kind: ConstantKind::Local { def_id: local_did, body: expr },


The issue with this way of doing it is that it doesn't differentiate between "normal" constants and associated ones, which is why I think you have the issue in the search index generation.

crlf0710 · 2021-06-05T08:08:18Z

@CraftSpider Ping from triage, any updates on this?

CraftSpider · 2021-06-05T15:16:03Z

I haven't really had time to work on it, feel free to close and I'll re-open if I make progress

JohnCSimon · 2021-06-22T04:34:02Z

triage: @CraftSpider closing PR on request Please feel free to reopen when you're ready to continue

This comment has been minimized.

Sign in to view

CraftSpider added 3 commits May 7, 2021 20:14

Make impl consts ConstantItems not AssocConstItems, to match typedefs

76f62bb

Run fmt

c053858

Fix test, no need for no_std

50e4a66

CraftSpider force-pushed the assoc-impl branch from e05a4ec to 50e4a66 Compare May 8, 2021 00:17

This comment has been minimized.

Sign in to view

rust-highfive assigned jyn514 May 8, 2021

CraftSpider marked this pull request as ready for review May 8, 2021 02:05

rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2021

CraftSpider changed the title ~~[WIP] Make impl consts ConstantItems not AssocConstItems, to match typedefs~~ Make impl consts ConstantItems not AssocConstItems, to match typedefs May 8, 2021

This comment has been minimized.

Sign in to view

Fix HTML test failures

a5ebf34

CraftSpider force-pushed the assoc-impl branch from 21ab7db to a5ebf34 Compare May 8, 2021 02:23

rust-highfive assigned GuillaumeGomez and unassigned jyn514 May 9, 2021

GuillaumeGomez reviewed May 9, 2021

View reviewed changes

jyn514 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-review Status: Awaiting review from the assignee but also interested parties. labels May 14, 2021

JohnCSimon added the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Jun 22, 2021

JohnCSimon closed this Jun 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Make impl consts ConstantItems not AssocConstItems, to match typedefs #83665

Make impl consts ConstantItems not AssocConstItems, to match typedefs #83665

Uh oh!

CraftSpider commented Mar 29, 2021

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

CraftSpider commented Mar 30, 2021

Uh oh!

This comment has been minimized.

CraftSpider commented May 8, 2021

Uh oh!

CraftSpider commented May 8, 2021

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 8, 2021

Uh oh!

CraftSpider commented May 8, 2021

Uh oh!

jyn514 commented May 9, 2021

Uh oh!

CraftSpider commented May 9, 2021

Uh oh!

GuillaumeGomez May 9, 2021

Uh oh!

crlf0710 commented Jun 5, 2021

Uh oh!

CraftSpider commented Jun 5, 2021

Uh oh!

JohnCSimon commented Jun 22, 2021

Uh oh!

Uh oh!

Make impl consts ConstantItems not AssocConstItems, to match typedefs #83665

Make impl consts ConstantItems not AssocConstItems, to match typedefs #83665

Uh oh!

Conversation

CraftSpider commented Mar 29, 2021

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

CraftSpider commented Mar 30, 2021

Uh oh!

This comment has been minimized.

CraftSpider commented May 8, 2021

Uh oh!

CraftSpider commented May 8, 2021

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 8, 2021

Uh oh!

CraftSpider commented May 8, 2021

Uh oh!

jyn514 commented May 9, 2021

Uh oh!

CraftSpider commented May 9, 2021

Uh oh!

GuillaumeGomez May 9, 2021

Choose a reason for hiding this comment

Uh oh!

crlf0710 commented Jun 5, 2021

Uh oh!

CraftSpider commented Jun 5, 2021

Uh oh!

JohnCSimon commented Jun 22, 2021

Uh oh!

Uh oh!