Skip to content

Fix hyperlinks in From impls between Vec and VecDeque#61926

Merged
bors merged 1 commit intorust-lang:masterfrom
scottmcm:vec-vecdeque
Jul 18, 2019
Merged

Fix hyperlinks in From impls between Vec and VecDeque#61926
bors merged 1 commit intorust-lang:masterfrom
scottmcm:vec-vecdeque

Conversation

@scottmcm
Copy link
Member

@scottmcm scottmcm commented Jun 18, 2019 •
edited
Loading

I'd been trying to link them, but apparently actually just added brackets: https://doc.rust-lang.org/nightly/std/collections/struct.VecDeque.html#impl-From%3CVec%3CT%3E%3E

This reverts commit 5168f5d.

(I'd previously tried to make relative links, but those failed linkcheck because the types are exported at different levels. So just skip the links -- they're already linked in the function signature anyway.)

This makes the links now work.

@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 18, 2019

r? @Kimundi

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 18, 2019
mati865
mati865 reviewed Jun 18, 2019
View reviewed changes
@rust-highfive
Copy link
Contributor

rust-highfive commented Jun 21, 2019

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:3005a9b0:start=1561099211084249740,finish=1561099211912944869,duration=828695129
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:09:58] 
[01:09:58] running 9 tests
[01:09:58] iiiiiiiii
[01:09:58] 
[01:09:58]  finished in 0.164
[01:09:58] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:10:15] 
[01:10:15] running 122 tests
[01:10:42] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:10:47] .i.i......iii.i.....ii
[01:10:47] 
[01:10:47]  finished in 32.060
[01:10:47] travis_fold:end:test_debuginfo

---
[01:48:28] travis_fold:end:stage0-linkchecker

[01:48:28] travis_time:end:stage0-linkchecker:start=1561105728320341340,finish=1561105730746704722,duration=2426363382

[01:48:30] std/vec/struct.Vec.html:2096: broken link - std/vec/VecDeque
[01:48:30] std/vec/struct.Vec.html:2135: broken link - std/vec/VecDeque
[01:48:31] std/collections/struct.VecDeque.html:633: broken link - std/collections/VecDeque
[01:48:31] std/collections/struct.VecDeque.html:655: broken link - std/collections/VecDeque
[01:48:31] std/collections/vec_deque/struct.VecDeque.html:633: broken link - std/collections/vec_deque/VecDeque
[01:48:31] std/collections/vec_deque/struct.VecDeque.html:655: broken link - std/collections/vec_deque/VecDeque
[01:48:32] std/convert/trait.From.html:625: broken link - std/convert/VecDeque
[01:48:32] std/convert/trait.From.html:647: broken link - std/convert/VecDeque
[01:48:35] thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:41:9
[01:48:35] 
[01:48:35] 
[01:48:35] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
[01:48:35] expected success, got: exit code: 101
---
travis_time:end:1d4fccf9:start=1561105740313429451,finish=1561105740320390683,duration=6961232
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03dd7b40
$ 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:21e48df0
travis_time:start:21e48df0
$ 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:1b0eb565
$ 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)

@scottmcm
Fix the links in Vec(Deque)-from-Vec(Deque)
38d4c1b 
Ok, I can't use `std` in doc-links, only in doc-tests.  Try 7...
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 10, 2019

This looks like it no longer reverts that commit but rather does more? Updating the PR description/title would be great if I'm correct about that.

The implementation (presuming it passes linkcheck) looks good to me, so r=me when ready

r? @Mark-Simulacrum

@scottmcm scottmcm changed the title Revert "Add hyperlinks to Vec and VecDeque" Fix hyperlinks in From impls between Vec and VecDeque Jul 18, 2019
@scottmcm
Copy link
Member Author

scottmcm commented Jul 18, 2019

Fixed the title and OP.

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jul 18, 2019

📌 Commit 38d4c1b has been approved by Mark-Simulacrum

@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 Jul 18, 2019
@scottmcm
Copy link
Member Author

scottmcm commented Jul 18, 2019

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 18, 2019
@Mark-Simulacrum
Rollup merge of rust-lang#61926 - scottmcm:vec-vecdeque, r=Mark-Simul…
7fc80b6 
…acrum

Fix hyperlinks in From impls between Vec and VecDeque

I'd been trying to link them, but apparently actually just added brackets: <https://doc.rust-lang.org/nightly/std/collections/struct.VecDeque.html#impl-From%3CVec%3CT%3E%3E>

~~This reverts commit 5168f5d.~~

~~(I'd previously tried to make relative links, but those failed linkcheck because the types are exported at different levels.  So just skip the links -- they're already linked in the function signature anyway.)~~

This makes the links now work.
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 18, 2019
Merged
bors added a commit that referenced this pull request Jul 18, 2019
@bors
Auto merge of #62782 - Mark-Simulacrum:rollup-1hz5ya6, r=Mark-Simulacrum
311376d 
Rollup of 15 pull requests

Successful merges:

 - #61926 (Fix hyperlinks in From impls between Vec and VecDeque)
 - #62615 ( Only error about MSVC + PGO + unwind if we're generating code)
 - #62696 (Check that trait is exported or public before adding hint)
 - #62712 (Update the help message on error for self type)
 - #62728 (Fix repeated wording in slice documentation)
 - #62730 (Consolidate hygiene tests)
 - #62732 (Remove last use of mem::uninitialized from std::io::util)
 - #62740 (Add missing link to Infallible in TryFrom doc)
 - #62745 (update data_layout and features for armv7-wrs-vxworks)
 - #62749 (Document link_section arbitrary bytes)
 - #62752 (Disable Z3 in LLVM build)
 - #62764 (normalize use of backticks in compiler messages for librustc/lint)
 - #62774 (Disable simd_select_bitmask test on big endian)
 - #62777 (Self-referencial type now called a recursive type)
 - #62778 (Emit artifact notifications for dependency files)

Failed merges:

 - #62746 ( do not use mem::uninitialized in std::io)

r? @ghost
@bors bors merged commit 38d4c1b into rust-lang:master Jul 18, 2019
@mati865 mati865 mentioned this pull request Aug 27, 2019
Open
@scottmcm scottmcm deleted the vec-vecdeque branch September 2, 2019 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nagisa nagisa nagisa left review comments

@mati865 mati865 mati865 left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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.

7 participants

@scottmcm @rust-highfive @Mark-Simulacrum @bors @nagisa @mati865 @Kimundi