Skip to content
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.

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

Hide default impls items #54162

Merged
merged 6 commits into from
Nov 3, 2018

Conversation

GuillaumeGomez
Copy link
Member

Follow up of #51885.
Fixes #54025.

cc @Mark-Simulacrum

r? @QuietMisdreavus

And screenshots of course:

screen shot 2018-09-12 at 23 30 35

screen shot 2018-09-12 at 23 30 42

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:04:52] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:52] tidy error: /checkout/src/librustdoc/html/static/main.js:2056: line longer than 100 chars
[00:04:52] tidy error: /checkout/src/librustdoc/html/static/main.js:2064: line longer than 100 chars
[00:04:53] some tidy checks failed
[00:04:53] 
[00:04:53] 
[00:04:53] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:53] 
[00:04:53] 
[00:04:53] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:53] Build completed unsuccessfully in 0:00:50
[00:04:53] Build completed unsuccessfully in 0:00:50
[00:04:53] make: *** [tidy] Error 1
[00:04:53] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:02488c20
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:187244b3:start=1536789115385552651,finish=1536789115390908911,duration=5356260
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:15d61abd
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:165f22c6
travis_time:start:165f22c6
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1f49a1ba
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Sep 12, 2018

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

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:04:37] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:38] tidy error: /checkout/src/librustdoc/html/static/main.js:2069: line longer than 100 chars
[00:04:38] tidy error: /checkout/src/librustdoc/html/static/main.js:2077: line longer than 100 chars
[00:04:39] some tidy checks failed
[00:04:39] 
[00:04:39] 
[00:04:39] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:39] 
[00:04:39] 
[00:04:39] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:39] Build completed unsuccessfully in 0:00:50
[00:04:39] Build completed unsuccessfully in 0:00:50
[00:04:39] make: *** [tidy] Error 1
[00:04:39] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1056f006
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:021a9b00:start=1537616984083862983,finish=1537616984088505077,duration=4642094
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03a5f3e0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:06568dd4
travis_time:start:06568dd4
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:12e1d569
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez
Copy link
Member Author

Updated.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:54:20] ....................................................................................................
[00:54:23] ....................................................i...............................................
[00:54:26] ....................................................................................................
[00:54:29] ....................................................................................................
[00:54:32] iiiiiiiii...........................................................................................
[00:54:39] ....................................................................................................
[00:54:42] ....................................................................................i...............
[00:54:45] ....................................................................................................
[00:54:48] .......................................i.i..ii......................................................
---
travis_time:start:test_rustdoc
Check compiletest suite=rustdoc mode=rustdoc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:08:58] 
[01:08:58] running 264 tests
[01:09:54] ...F...................i............................................................................
5438736 .
3177408 ./obj
2961440 ./obj/build
2341548 ./obj/build/x86_64-unknown-linux-gnu
---
151412 ./src/tools/clang
149120 ./src/llvm-emscripten/test
148628 ./obj/build/bootstrap/debug/incremental
134176 ./obj/build/bootstrap/debug/incremental/bootstrap-2zc4gzhr0d54q
134172 ./obj/build/bootstrap/debug/incremental/bootstrap-2zc4gzhr0d54q/s-f51g3c5y9a-jtdi7f-2g4vvhe5tuul3
131352 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release
129776 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu
129772 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release
128436 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps
---
76548 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu
76544 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release
74192 ./obj/build/x86_64-unknown-linux-gnu/stage0-sysroot
74188 ./obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib
74184 ./obj/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/n printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:00624020
travis_time:start:00624020
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:01886056
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez
Copy link
Member Author

Not ready for the moment (because of #54492).

@XAMPPRocky
Copy link
Member

Triage; @QuietMisdreavus Hello, are you able to review this PR?

@GuillaumeGomez
Copy link
Member Author

@Aaronepower: Not ready yet so reviewing wouldn't be very useful for the moment...

@XAMPPRocky XAMPPRocky 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 Sep 27, 2018
@TimNN
Copy link
Contributor

TimNN commented Oct 16, 2018

Ping from triage @GuillaumeGomez: what is the status of this PR?

@GuillaumeGomez
Copy link
Member Author

Still need to be updated. Trying to do more urgent issues first.

@GuillaumeGomez
Copy link
Member Author

Should be ready to go now!

pub fn is_associated(&self) -> bool {
match *self {
ItemEnum::TypedefItem(_, _) |
ItemEnum::AssociatedConstItem(_, _) |
Copy link
Member

Choose a reason for hiding this comment

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

I feel like associated consts don't need to be shown all the time, since we don't show const values any more.

@TimNN
Copy link
Contributor

TimNN commented Oct 30, 2018

Ping from triage @GuillaumeGomez: it looks like some updates have been requested to your PR.

@GuillaumeGomez
Copy link
Member Author

I'll update it in the next days.

Copy link
Member

@QuietMisdreavus QuietMisdreavus left a comment

Choose a reason for hiding this comment

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

r=me pending travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0d1e8e65:start=1541113136809346707,finish=1541113192063172597,duration=55253825890
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:53:53] .................................................................................................... 100/4983
[00:53:56] .................................................................................................... 200/4983
[00:53:59] ...........................................................................................ii....... 300/4983
[00:54:02] .........................................................................................iii........ 400/4983
[00:54:05] iiiiiiii.iii...........................iii...........................................i...........i.. 500/4983
[00:54:12] .................................................................................................... 700/4983
[00:54:19] ..................................................................i...........i..................... 800/4983
[00:54:22] ....................................................................................iiiii........... 900/4983
[00:54:26] .................................................................................................... 1000/4983
---
[00:55:04] .................................................................................................... 2200/4983
[00:55:09] .................................................................................................... 2300/4983
[00:55:13] .................................................................................................... 2400/4983
[00:55:17] .................................................................................................... 2500/4983
[00:55:21] ...................................................................iiiiiiiii........................ 2600/4983
[00:55:29] ..................ii................................................................................ 2800/4983
[00:55:32] .................................................................................................... 2900/4983
[00:55:36] .................................................................................................... 3000/4983
[00:55:39] .............i...................................................................................... 3100/4983
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:14] 
[01:10:14] running 115 tests
[01:10:17] i..ii...iii..iii.....i...i.........i..iii...........i.....i.....ii...i..i.ii..............i...ii..ii 100/115
[01:10:18] .i....iiii.....
[01:10:18] 
[01:10:18]  finished in 3.710
[01:10:18] travis_fold:end:test_codegen

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:33] 
[01:10:33] running 118 tests
[01:10:58] .iiiii...i.....i..i...i..i.i..i.i..i.....i..i....i..........iiii.........i.i....i...i.......ii.i.i.i 100/118
[01:11:02] ......iii.i.....ii
[01:11:02] 
[01:11:02]  finished in 28.928
[01:11:02] travis_fold:end:test_debuginfo

---
travis_time:start:test_rustdoc
Check compiletest suite=rustdoc mode=rustdoc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:17:18] 
[01:17:18] running 270 tests
[01:18:28] ...F...................i............................................................................ 100/270
[01:20:09] ......................................................................
[01:20:09] failures:
[01:20:09] 
[01:20:09] ---- [rustdoc] rustdoc/assoc-consts.rs stdout ----
[01:20:09] ---- [rustdoc] rustdoc/assoc-consts.rs stdout ----
[01:20:09] 
[01:20:09] error: htmldocck failed!
[01:20:09] status: exit code: 1
[01:20:09] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/assoc-consts" "/checkout/src/test/rustdoc/assoc-consts.rs"
[01:20:09] ------------------------------------------
[01:20:09] 
[01:20:09] ------------------------------------------
[01:20:09] stderr:
[01:20:09] stderr:
[01:20:09] ------------------------------------------
[01:20:09] 102: @has check failed
[01:20:09]  `XPATH PATTERN` did not match
[01:20:09]      // @has - '//*[@class="docblock"]' "Docs for QUX_DEFAULT12 in trait."
[01:20:09] Encountered 1 errors
[01:20:09] 
[01:20:09] ------------------------------------------
[01:20:09] 
---
[01:20:09] 
[01:20:09] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:503:22
[01:20:09] 
[01:20:09] 
[01:20:09] 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" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "rustdoc" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-5.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "5.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:20:09] 
[01:20:09] 
[01:20:09] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:20:09] Build completed unsuccessfully in 0:30:13
[01:20:09] Build completed unsuccessfully in 0:30:13
[01:20:09] make: *** [check] Error 1
[01:20:09] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:1a144aa7
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@QuietMisdreavus
Copy link
Member

[01:20:09] ---- [rustdoc] rustdoc/assoc-consts.rs stdout ----
[01:20:09] 
[01:20:09] error: htmldocck failed!
[01:20:09] status: exit code: 1
[01:20:09] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/assoc-consts" "/checkout/src/test/rustdoc/assoc-consts.rs"
[01:20:09] stdout:
[01:20:09] ------------------------------------------
[01:20:09] 
[01:20:09] ------------------------------------------
[01:20:09] stderr:
[01:20:09] ------------------------------------------
[01:20:09] 102: @has check failed
[01:20:09] 	`XPATH PATTERN` did not match
[01:20:09] 	    // @has - '//*[@class="docblock"]' "Docs for QUX_DEFAULT12 in trait."
[01:20:09] 
[01:20:09] Encountered 1 errors
[01:20:09] 
[01:20:09] ------------------------------------------
[01:20:09] 
[01:20:09] thread '[rustdoc] rustdoc/assoc-consts.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3284:9
[01:20:09] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:20:09] 
[01:20:09] 
[01:20:09] failures:
[01:20:09]     [rustdoc] rustdoc/assoc-consts.rs

This is the second QUX_DEFAULT12, the one from the impl. Is the code removing the override docs entirely, somehow?

@GuillaumeGomez
Copy link
Member Author

I think the problem is a missing class here.

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Nov 2, 2018

Updated the failing test accordingly (it was a missing class).

@QuietMisdreavus
Copy link
Member

r=me pending travis

@GuillaumeGomez
Copy link
Member Author

@bors: r=QuietMisdreavus

@bors
Copy link
Contributor

bors commented Nov 3, 2018

📌 Commit ca65b43 has been approved by QuietMisdreavus

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 3, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 3, 2018
…tems, r=QuietMisdreavus

Hide default impls items

Follow up of rust-lang#51885.
Fixes rust-lang#54025.

cc @Mark-Simulacrum

r? @QuietMisdreavus

And screenshots of course:

<img width="1440" alt="screen shot 2018-09-12 at 23 30 35" src="https://user-images.githubusercontent.com/3050060/45454424-1ff8d500-b6e4-11e8-9257-030322495d58.png">

<img width="1440" alt="screen shot 2018-09-12 at 23 30 42" src="https://user-images.githubusercontent.com/3050060/45454431-2424f280-b6e4-11e8-8d65-db0d85ac18f0.png">
bors added a commit that referenced this pull request Nov 3, 2018
Rollup of 5 pull requests

Successful merges:

 - #54162 (Hide default impls items)
 - #55555 (Make `-Z ls` list the actual filename of external dependencies)
 - #55567 (add test for deriving Debug on uninhabited enum)
 - #55568 (test that rustdoc doesn't overflow on a big enum)
 - #55598 (publish-toolstate: ping maintainers when a tool builds again)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 3, 2018

⌛ Testing commit ca65b43 with merge 3d28ee3...

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.

6 participants