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.

Sign up for GitHub

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

Jump to bottom

Fix image link in the settings menu #58028

Merged
merged 1 commit into from
Feb 7, 2019
Merged

Fix image link in the settings menu #58028

merged 1 commit into from
Feb 7, 2019

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 Jan 31, 2019
QuietMisdreavus
QuietMisdreavus reviewed Jan 31, 2019
View reviewed changes
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.

Since you're doing the same "slash-checking" multiple times, i wonder if you can factor that into a wrapper struct that implements Display, and does the slash-checking in that impl...

src/librustdoc/html/render.rs Outdated Show resolved Hide resolved
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.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:005ff994:start=1548948588015930186,finish=1548948588934019490,duration=918089304
$ 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-6.0
---

[00:04:20] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:21] tidy error: /checkout/src/librustdoc/html/layout.rs:184: line longer than 100 chars
[00:04:22] some tidy checks failed
[00:04:22] 
[00:04:22] 
[00:04:22] 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:22] 
[00:04:22] 
[00:04:22] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:22] Build completed unsuccessfully in 0:00:45
[00:04:22] Build completed unsuccessfully in 0:00:45
[00:04:22] Makefile:68: recipe for target 'tidy' failed
[00:04:22] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:07bedf8e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan 31 15:34:22 UTC 2019
---
travis_time:end:02185374:start=1548948862706047828,finish=1548948862710578370,duration=4530542
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03872514
$ 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:040e9fa0
travis_time:start:040e9fa0
$ 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:0fdc5dc7
$ 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 created the SlashChecker type. A bit better indeed. :)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.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:03309aaa:start=1548972534773241658,finish=1548972645629062688,duration=110855821030
$ 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-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:12:50] 
[01:12:50] running 119 tests
[01:13:15] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:13:19] i......iii.i.....ii
[01:13:19] 
[01:13:19]  finished in 28.453
[01:13:19] 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:01] 
[01:17:01] running 292 tests
[01:18:05] ...........................i........................................F............................... 100/292
[01:19:52] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:502:22
[01:19:52] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:502:22
[01:19:52] ........F...................................................................................
[01:19:52] 
[01:19:52] ---- [rustdoc] rustdoc/index-page.rs stdout ----
[01:19:52] 
[01:19:52] 
[01:19:52] error: htmldocck failed!
[01:19:52] status: exit code: 1
[01:19:52] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/index-page" "/checkout/src/test/rustdoc/index-page.rs"
[01:19:52] ------------------------------------------
[01:19:52] 
[01:19:52] ------------------------------------------
[01:19:52] stderr:
[01:19:52] stderr:
[01:19:52] ------------------------------------------
[01:19:52] 7: @has check failed
[01:19:52]  `XPATH PATTERN` did not match
[01:19:52]  // @has - '//ul[@class="mod"]//a[@href="foo/index.html"]' 'foo'
[01:19:52] Encountered 1 errors
[01:19:52] 
[01:19:52] ------------------------------------------
[01:19:52] 
[01:19:52] 
[01:19:52] thread '[rustdoc] rustdoc/index-page.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3295:9
[01:19:52] 
[01:19:52] ---- [rustdoc] rustdoc/keyword.rs stdout ----
[01:19:52] 
[01:19:52] error: htmldocck failed!
[01:19:52] status: exit code: 1
[01:19:52] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/keyword" "/checkout/src/test/rustdoc/keyword.rs"
[01:19:52] ------------------------------------------
[01:19:52] 
[01:19:52] ------------------------------------------
[01:19:52] stderr:
[01:19:52] stderr:
[01:19:52] ------------------------------------------
[01:19:52] 10: @!has check failed
[01:19:52]  `XPATH PATTERN` did not match
[01:19:52]  // @!has foo/index.html '//a/@href' 'foo/index.html'
[01:19:52] Encountered 1 errors
[01:19:52] 
[01:19:52] ------------------------------------------
[01:19:52] 
---
[01:19:52] test result: FAILED. 288 passed; 2 failed; 2 ignored; 0 measured; 0 filtered out
[01:19:52] 
[01:19:52] 
[01:19:52] 
[01:19:52] 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-6.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" "6.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:19:52] 
[01:19:52] 
[01:19:52] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:19:52] Build completed unsuccessfully in 0:18:28
[01:19:52] Build completed unsuccessfully in 0:18:28
[01:19:52] make: *** [check] Error 1
[01:19:52] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0508ffe0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan 31 23:30:48 UTC 2019
---
travis_time:end:05bf9cc8:start=1548977450058911250,finish=1548977450063657664,duration=4746414
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:079b497d
$ 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

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

One of my changes was invalid. Fixed now.

@QuietMisdreavus
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 7, 2019

📌 Commit 5cf20ca 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 Feb 7, 2019
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 7, 2019
@GuillaumeGomez
Rollup merge of rust-lang#58028 - GuillaumeGomez:fix-settings-image-l…
1a99a32 
…ink, r=QuietMisdreavus

Fix image link in the settings menu

Fixes rust-lang#57892.

r? @QuietMisdreavus
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 7, 2019
Merged
bors added a commit that referenced this pull request Feb 7, 2019
@bors
Auto merge of #58266 - GuillaumeGomez:rollup, r=GuillaumeGomez
d173180 
Rollup of 11 pull requests

Successful merges:

 - #57504 (Re-enable history api on file:// protocol)
 - #57848 (Generate a documentation page for core::mem::transmute.)
 - #57884 (Update minifier version)
 - #57954 (rustdoc: remove blank unstable spans)
 - #58028 (Fix image link in the settings menu)
 - #58033 (rustdoc: wrap stability tags in colored spans)
 - #58086 ([rustdoc] Improve file list display)
 - #58143 (Sort elements in the sidebar)
 - #58146 (Prevent automatic collapse of methods impl blocks)
 - #58150 (Don't apply impl block collapse rules to trait impls)
 - #58185 (Remove images' url to make it work even without internet connection)

Failed merges:

r? @ghost
@bors bors merged commit 5cf20ca into rust-lang:master Feb 7, 2019
@GuillaumeGomez GuillaumeGomez deleted the fix-settings-image-link branch February 8, 2019 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuietMisdreavus QuietMisdreavus QuietMisdreavus left review comments

Assignees

@QuietMisdreavus QuietMisdreavus

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @rust-highfive @QuietMisdreavus @bors