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

Rollup of 7 pull requests #59447

Merged
merged 26 commits into from
Mar 27, 2019
Merged

Rollup of 7 pull requests #59447

merged 26 commits into from
Mar 27, 2019

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 26 commits March 8, 2019 20:12
This adds some missing documentation for rustfix related things and adds
a test for the `is_test` function.
…=QuietMisdreavus

[rustdoc] Improve "in parameters" search and search more generally

Fixes rust-lang#58230.

r? @QuietMisdreavus
…r=QuietMisdreavus

Fix moving text in search tabs headers

Fixes rust-lang#59005.

Now, the text in the search tabs headers isn't moving anymore.

r? @QuietMisdreavus
Exclude old book redirect stubs from search engines

Adds `<meta name="robots" content="noindex,follow">` to the `<head>` of old stub pages pointing to the second edition of the book.

This is continuation of rust-lang/book#1788
…ation, r=steveklabnik

Improve the documentation for std::convert (From, Into, AsRef and AsMut)

# Description
In this PR I updated the documentation of From, Into, AsRef and AsMut, as well as the general std::convert module documentation. The discussion in rust-lang#59163 provided information that was not yet present in the docs, or was not expressed clearly enough. I tried to clarify the examples that were already present in the docs as well as add more information about considered best-practices that came out of the discussion in rust-lang#59163

@steveklabnik I hope I didn't change too much. This is an initial version! I will scan through everything tomorrow as well again to see if I made any typo's or errors, and maybe make some small changes here and there.

All suggestions are welcome!

closes rust-lang#59163
…=QuietMisdreavus

Fix code block display in portability element in dark theme

Fixes rust-lang#59261.

r? @QuietMisdreavus

A little screenshot:

<img width="521" alt="Screenshot 2019-03-26 at 00 37 49" src="https://user-images.githubusercontent.com/3050060/54961082-9a41c600-4f5f-11e9-8040-ae6f26d368ff.png">
…-Simulacrum

Link to PhantomData in NonNull documentation
…chton

Improve some compiletest documentation

This adds some missing documentation for rustfix related things and adds
a test for the `is_test` function.
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=7

@bors
Copy link
Contributor

bors commented Mar 26, 2019

📌 Commit cbb13f4 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 26, 2019
@bors
Copy link
Contributor

bors commented Mar 26, 2019

⌛ Testing commit cbb13f4 with merge 4752cbe...

bors added a commit that referenced this pull request Mar 26, 2019
Rollup of 7 pull requests

Successful merges:

 - #59004 ([rustdoc] Improve "in parameters" search and search more generally)
 - #59026 (Fix moving text in search tabs headers)
 - #59197 (Exclude old book redirect stubs from search engines)
 - #59330 (Improve the documentation for std::convert (From, Into, AsRef and AsMut))
 - #59424 (Fix code block display in portability element in dark theme)
 - #59427 (Link to PhantomData in NonNull documentation)
 - #59432 (Improve some compiletest documentation)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 27, 2019

💔 Test failed - checks-travis

@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 Mar 27, 2019
@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:54:54] test string::test_str_truncate ... ok
[01:54:54] test string::test_slicing ... ok
[01:54:54] test string::test_str_truncate_invalid_len ... ok
[01:54:54] test string::test_str_truncate_split_codepoint ... ok
[01:54:55] died due to signal 11
[01:54:55] 
[01:54:55] 
[01:54:55] 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:54:55] expected success, got: exit code: 3
---
travis_time:end:056e5cc3:start=1553651659840217068,finish=1553651659853333556,duration=13116488
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:128fb742
$ 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:0b486e8a
travis_time:start:0b486e8a
$ 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:2efc103a
$ 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)

@Centril
Copy link
Contributor

Centril commented Mar 27, 2019

@bors retry

@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 Mar 27, 2019
@bors
Copy link
Contributor

bors commented Mar 27, 2019

⌛ Testing commit cbb13f4 with merge 267fb90...

bors added a commit that referenced this pull request Mar 27, 2019
Rollup of 7 pull requests

Successful merges:

 - #59004 ([rustdoc] Improve "in parameters" search and search more generally)
 - #59026 (Fix moving text in search tabs headers)
 - #59197 (Exclude old book redirect stubs from search engines)
 - #59330 (Improve the documentation for std::convert (From, Into, AsRef and AsMut))
 - #59424 (Fix code block display in portability element in dark theme)
 - #59427 (Link to PhantomData in NonNull documentation)
 - #59432 (Improve some compiletest documentation)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 27, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: GuillaumeGomez
Pushing 267fb90 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2019
@bors bors merged commit cbb13f4 into rust-lang:master Mar 27, 2019
@GuillaumeGomez GuillaumeGomez deleted the rollup branch March 27, 2019 09:09
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

7 participants