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

Add version display for associated consts #55798

Merged

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 8, 2018
@GuillaumeGomez GuillaumeGomez force-pushed the version-display-associated-const branch from 75a0102 to 2c47647 Compare November 8, 2018 23:03
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.

One question about HTML semantics.

let src = if let Some(l) = (Item { cx, item }).src_href() {
if !version.is_empty() {
write!(w, "</span></td><td><span class='out-of-band'>")?;
Copy link
Member

Choose a reason for hiding this comment

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

Does this </span> match the original class='invisible' one from before the initial <table>? I'm guessing it displays okay based on your screenshot, but this seems odd.

Copy link
Member Author

Choose a reason for hiding this comment

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

I took the exact same code as above. I'd need to double check but I assume it does, otherwise the html checker would have failed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed, I'll update it soon.

@TimNN TimNN 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 Nov 20, 2018
@GuillaumeGomez GuillaumeGomez added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 24, 2018
@GuillaumeGomez GuillaumeGomez force-pushed the version-display-associated-const branch from 2c47647 to a91b1ac Compare December 16, 2018 20:48
@GuillaumeGomez
Copy link
Member Author

I fixed the DOM.

@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:start:07eefcc6
$ git fetch origin +refs/pull/55798/merge:
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
---
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
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
---
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py:122: InsecurePlatformWarning: A true SSLContext object is not available. This prevents urllib3 from configuring SSL appropriately and may cause certain SSL connections to fail. You can upgrade to a newer version of Python to solve this. For more information, see https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning.
  InsecurePlatformWarning
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
---
    94% |██████████████████████████████▏ | 4.8MB 4.7MB/s eta 0:00:01
    94% |██████████████████████████████▎ | 4.8MB 4.7MB/s eta 0:00:01
    94% |██████████████████████████████▎ | 4.8MB 3.2MB/s eta 0:00:01
    94% |██████████████████████████████▍ | 4.9MB 4.7MB/s eta 0:00:01
    95% |██████████████████████████████▍ | 4.9B/s eta 0:00:01████████████████████████████▊| 5.1MB 79.6MB/s eta 0:00:01
    99% |████████████████████████████████| 5.1MB 81.4MB/s eta 0:00:01
    99% |████████████████████████████████| 5.1MB 81.4MB/s eta 0:00:01MB 4.7MB/s eta 0:00:01
    95% |██████████████████████████████▌ | 4.9MB 4.7MB/s eta 0:00:01
    95% |██████████████████████████████▌ | 4.9MB 4.7MB/s eta 0:00:01
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[00:51:36] 
[00:51:36] running 121 tests
[00:51:39] i..ii...iii..iiii.....i...i..........i..iii.............i.....i......ii...i..i.ii..............i...i 100/121
[00:51:39] i..ii.i.....iiii.....
[00:51:39] 
[00:51:39]  finished in 3.337
[00:51:39] 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)
[00:51:54] 
[00:51:54] running 119 tests
[00:52:16] .iiiii...i.....i..i...i..i.i..i.ii..i.....i..i....i..........iiii.........i.i...ii...i.......ii.i.i. 100/119
[00:52:20] i......iii.i.....ii
[00:52:20] 
[00:52:20]  finished in 26.483
[00:52:20] 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)
[00:57:04] 
[00:57:04] running 281 tests
[00:58:09] .FF...........F........i................F.F.......................F..........F...................... 100/281
[00:59:03] .............F.......F..F........i....F................F............................................ 200/281
[00:59:47] ......................F..........................................................
[00:59:47] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:503:22
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/assoc-consts.rs stdout ----
[00:59:47] 
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] 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"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'assoc_consts/trait.Foo.html': multiple elements on top level
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/assoc-consts.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:59:47] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/assoc-types.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/assoc-types" "/checkout/src/test/rustdoc/assoc-types.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] 18: @has check failed
[00:59:47]  `XPATH PATTERN` did not match
[00:59:47]      // @has - '//*[@id="Output.t"]//code' 'type Output: ?Sized'
[00:59:47] 20: @has check failed
[00:59:47]  `XPATH PATTERN` did not match
[00:59:47]      // @has - '//*[@id="index.v"]//code' 'fn index'
[00:59:47] Encountered 2 errors
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/assoc-types.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/const-doc.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/const-doc" "/checkout/src/test/rustdoc/const-doc.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'const_doc/struct.ContentType.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/const-doc.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/extern-default-method.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/extern-default-method" "/checkout/src/test/rustdoc/extern-default-method.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 419, in check_command
[00:59:47]     found = get_tree_count(cache.get_tree(c.args[0]), c.args[1])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'extern_default_method/struct.Struct.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/extern-default-method.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/extern-impl-trait.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/extern-impl-trait" "/checkout/src/test/rustdoc/extern-impl-trait.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'foo/struct.X.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/extern-impl-trait.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/inline_cross/assoc-items.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/inline_cross/assoc-items" "/checkout/src/test/rustdoc/inline_cross/assoc-items.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'foo/struct.MyStruct.html': multiple elements on top level
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/inline_cross/assoc-items.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/inline_cross/trait-vis.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/inline_cross/trait-vis" "/checkout/src/test/rustdoc/inline_cross/trait-vis.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'trait_vis/struct.SomeStruct.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/inline_cross/trait-vis.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/issue-19190-3.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-19190-3" "/checkout/src/test/rustdoc/issue-19190-3.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'issue_19190_3/struct.Foo.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/issue-19190-3.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/issue-21092.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-21092" "/checkout/src/test/rustdoc/issue-21092.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'issue_21092/struct.Bar.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/issue-21092.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/issue-21801.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-21801" "/checkout/src/test/rustdoc/issue-21801.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'issue_21801/struct.Foo.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/issue-21801.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/issue-28478.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-28478" "/checkout/src/test/rustdoc/issue-28478.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'issue_28478/trait.Bar.html': pop from empty stack
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/issue-28478.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/issue-33302.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/issue-33302" "/checkout/src/test/rustdoc/issue-33302.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'issue_33302/trait.T.html': multiple elements on top level
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/issue-33302.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
[00:59:47] 
[00:59:47] ---- [rustdoc] rustdoc/primitive-generic-impl.rs stdout ----
[00:59:47] 
[00:59:47] error: htmldocck failed!
[00:59:47] status: exit code: 1
[00:59:47] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/primitive-generic-impl" "/checkout/src/test/rustdoc/primitive-generic-impl.rs"
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] ------------------------------------------
[00:59:47] stderr:
[00:59:47] stderr:
[00:59:47] ------------------------------------------
[00:59:47] Traceback (most recent call last):
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 461, in <module>
[00:59:47]     check(sys.argv[1], get_commands(sys.argv[2]))
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 454, in check
[00:59:47]     check_command(c, cache)
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 403, in check_command
[00:59:47]     tree = cache.get_tree(c.args[0])
[00:59:47]   File "/checkout/src/etc/htmldocck.py", line 311, in get_tree
[00:59:47]     raise RuntimeError('Cannot parse an HTML file {!r}: {}'.format(path, e))
[00:59:47] RuntimeError: Cannot parse an HTML file 'foo/primitive.i32.html': multiple elements on top level
[00:59:47] ------------------------------------------
[00:59:47] 
[00:59:47] thread '[rustdoc] rustdoc/primitive-generic-impl.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3252:9
[00:59:47] 
---
[00:59:47] test result: FAILED. 266 passed; 13 failed; 2 ignored; 0 measured; 0 filtered out
[00:59:47] 
[00:59:47] 
[00:59:47] 
[00:59:47] 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  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--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"
[00:59:47] 
[00:59:47] 
[00:59:47] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:59:47] Build completed unsuccessfully in 0:18:19
[00:59:47] Build completed unsuccessfully in 0:18:19
[00:59:47] Makefile:58: recipe for target 'check' failed
[00:59:47] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:021e7f08
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Dec 16 21:59:38 UTC 2018
---
travis_time:end:03c3c384:start=1544997579544352599,finish=1544997579549191734,duration=4839135
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0be0d370
$ 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:15d70410
travis_time:start:15d70410
$ 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:16d9a4ce
$ 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

I fixed the DOM.

Apparently not...

@GuillaumeGomez GuillaumeGomez force-pushed the version-display-associated-const branch from a91b1ac to 2968a5a Compare December 18, 2018 00:04
@GuillaumeGomez
Copy link
Member Author

Okay, should be good this time.

@GuillaumeGomez
Copy link
Member Author

Added test.

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.

Looks good, let's get this rolling!

@QuietMisdreavus
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 20, 2018

📌 Commit ca04c63 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 20, 2018
@bors
Copy link
Contributor

bors commented Dec 20, 2018

⌛ Testing commit ca04c63 with merge fb4765cd318d41500cdedeff530ed8b7b49274ea...

@bors
Copy link
Contributor

bors commented Dec 20, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job arm-android 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.
[01:38:01] test str::test_unsafe_slice ... ok
[01:38:01] test string::test_str_truncate_invalid_len ... ok
[01:38:01] test string::test_str_truncate ... ok
[01:38:01] test string::test_str_truncate_split_codepoint ... ok
[01:38:02] died due to signal 11
[01:38:02] 
[01:38:02] 
[01:38:02] 
[01:38:02] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:38:02] 
[01:38:02] 
[01:38:02] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target arm-linux-androideabi
[01:38:02] Build completed unsuccessfully in 1:26:42
---
travis_time:end:17172318:start=1545325363980841975,finish=1545325363998661647,duration=17819672
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:124a86d6
$ 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:09ca9ca7
travis_time:start:09ca9ca7
$ 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:1f474998
$ 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 bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 20, 2018
@pietroalbini
Copy link
Member

@bors retry

Segfault in the stdlib :/

@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 Dec 20, 2018
@bors
Copy link
Contributor

bors commented Dec 20, 2018

⌛ Testing commit ca04c63 with merge a97d78c69ced34ee446f0a31346844d7c0b138f8...

@bors
Copy link
Contributor

bors commented Dec 20, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck 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:18]    Compiling cargo v0.32.0
[00:04:24] error[E0308]: mismatched types
[00:04:24]  --> /cargo/registry/src/github.com-1ecc6299db9ec823/cargo-0.32.0/src/cargo/util/sha256.rs:9:34
[00:04:24]   |
[00:04:24] 9 |         let hasher = Hasher::new(Algorithm::SHA256);
[00:04:24]   |                                  |
[00:04:24]   |                                  |
[00:04:24]   |                                  expected reference, found enum `util::sha256::crypto_hash::Algorithm`
[00:04:24]   |                                  help: consider borrowing here: `&Algorithm::SHA256`
[00:04:24]   |
[00:04:24]   = note: expected type `&util::sha256::crypto_hash::Algorithm`
[00:04:24]              found type `util::sha256::crypto_hash::Algorithm`
[00:04:24] error: aborting due to previous error
[00:04:24] 
[00:04:24] For more information about this error, try `rustc --explain E0308`.
[00:04:24] For more information about this error, try `rustc --explain E0308`.
[00:04:24] error: failed to compile `cargo-vendor v0.1.22`, intermediate artifacts can be found at `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools`
[00:04:24] Caused by:
[00:04:24]   Could not compile `cargo`.
[00:04:24] 
[00:04:24] To learn more, run the command again with --verbose.
[00:04:24] To learn more, run the command again with --verbose.
[00:04:24] 
[00:04:24] 
[00:04:24] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "install" "-j" "4" "--locked" "--color" "always" "--force" "--debug" "--vers" "0.1.22" "cargo-vendor"
[00:04:24] 
[00:04:24] 
[00:04:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:04:24] Build completed unsuccessfully in 0:01:34
---
travis_time:end:00ed9c89:start=1545332041954381595,finish=1545332041966235229,duration=11853634
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:06dbfabc
$ 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:05d6a5dd
$ 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 bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 20, 2018
@alexcrichton
Copy link
Member

@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 Dec 20, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 21, 2018
…ciated-const, r=QuietMisdreavus

Add version display for associated consts

Fixes rust-lang#54030.

<img width="1440" alt="screenshot 2018-11-08 at 23 57 29" src="https://user-images.githubusercontent.com/3050060/48232648-99decf00-e3b2-11e8-9f41-6bd12a161c7d.png">

r? @QuietMisdreavus
@bors
Copy link
Contributor

bors commented Dec 21, 2018

⌛ Testing commit ca04c63 with merge 6d34ec1...

bors added a commit that referenced this pull request Dec 21, 2018
…t, r=QuietMisdreavus

Add version display for associated consts

Fixes #54030.

<img width="1440" alt="screenshot 2018-11-08 at 23 57 29" src="https://user-images.githubusercontent.com/3050060/48232648-99decf00-e3b2-11e8-9f41-6bd12a161c7d.png">

r? @QuietMisdreavus
@bors
Copy link
Contributor

bors commented Dec 21, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 6d34ec1 to master...

@bors bors merged commit ca04c63 into rust-lang:master Dec 21, 2018
@GuillaumeGomez GuillaumeGomez deleted the version-display-associated-const branch December 21, 2018 08:53
Centril added a commit to Centril/rust that referenced this pull request Jan 13, 2019
…umeGomez

Simplify foreign type rendering.

Simplified foreign type rendering by switching from tables to flexbox. Also, removed some seemingly extraneous elements like “ghost” spans.

Reduces element count on the `std::iter::Iterator` page by 30%. On my laptop it drops Iterator page load time from ~15s to ~10s. Frame times during scrolling are a hair lower too.

Known visual changes (happy to tweak based on feedback):
* The main `impl ...` headers are now getting the default, larger, h3 font size. This was an accident, but I liked how it turned out so I didn't fix it.
* There's a hair less vertical spacing between the end of a where block and the start of the next fn. Now, all spacing is consistent. I think this looks a bit worse. I may tweak vertical spacing more here or in a follow-up that cleans up vertical spacing more broadly.
* "[src]" links are all sized at 17px. A few were 19px in the original.

I haven't yet done heavy cross-browser or cross-crate testing. I was hoping to get a quick thumbs up or thumbs down here at this first draft, then if this is on the right track I'll spend some time on that testing.

TODO:

- [x] Test on Chrome
- [x] Test on Firefox
- [ ] ~~Test on UC Android~~
- [x] Test on Edge
- [x] Test on iOS safari
- [x] Test on desktop safari
- [x] Update automated tests
- [x] Increase vertical margin
- [x] Fix "Important traits for" hover overlap
- [x] Wait for rust-lang#55798 to land & merge it
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.

8 participants