Skip to content

Rollup of 7 pull requests - #68747

Closed
JohnTitor wants to merge 16 commits into
rust-lang:masterfrom
JohnTitor:rollup-klhrp3c
Closed

Rollup of 7 pull requests#68747
JohnTitor wants to merge 16 commits into
rust-lang:masterfrom
JohnTitor:rollup-klhrp3c

Conversation

@JohnTitor

@JohnTitorJohnTitor commented Feb 1, 2020

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

tomjakubowskiand others added 16 commits January 30, 2020 13:38
@tomjakubowski@GuillaumeGomez
rustdoc: NodeId is now DefId
b60f08b
@tomjakubowski@GuillaumeGomez
rustdoc: emit JS paths for struct-like variants
05c6f32
On the backend, rustdoc now emits `paths` entries to a crate's search
index for struct-like enum variants, and index items of type structfield
which belong to such variants point to their variant parents in the
`paths` table, rather than their enum grandparents. The path entry for
a variant is the fully qualified module path plus the enum name.
On the frontend, the search code recognizes structfields belonging to
structlike variants in the `paths` table and re-constructs the URL to
the field's anchor on the enum documentation page.
closesrust-lang#16017
@GuillaumeGomez
Add tests for struct variant field in search
862af62
@jbr
[docs] remind bug reporters to update nightly
2a79ed0
@jonas-schievink
Ignore build dir formatting
08e85aa
@hman523
Fixed issue 68593
346920c
@sinkuu
Use BufWriter
482c761
@sugar700
Remove a comment about pretty printer in formatting tests
cad0cfd
rustc is now using rustfmt, not the old formatter.
@JohnTitor
Do not suggest things named underscore
726568b
@JohnTitor
Rollup merge ofrust-lang#68460- sinkuu:emit_mir_buffered, r=Mark-Si…
b68e934
…mulacrum
Use BufWriter for emitting MIR
I noticed that `--emit=mir` takes long time on a large crate. rust-lang#64344 seem to have fixed `-Zdump-mir`, but not `--emit=mir`.
@JohnTitor
Rollup merge ofrust-lang#68668- GuillaumeGomez:struct-variant-field…
16a3507
…-search, r=kinnison
Struct variant field search
Fixesrust-lang#16017.
Reopening of rust-lang#64724.
cc @tomjakubowski
cc @ollie27
r? @kinnison
@JohnTitor
Rollup merge ofrust-lang#68688- jbr:remind-bug-reporters-to-update-…
3f938ae
…if-on-nightly, r=centril
[docs] remind bug reporters to update nightly
Hi and thanks for rust! Today I reported a bug in nightly that was already fixed, so I thought other potential bug reporters might appreciate a reminder to update before reporting. I wasn't sure if this would apply for other channels as well.
@JohnTitor
Rollup merge ofrust-lang#68704- jonas-schievink:ignore-build-fmt, r…
7a009e1
…=Mark-Simulacrum
Ignore `build` dir formatting
I've noticed that rustfmt tries to parse and check the formatting of code in `build` if `.git` is missing (which includes test artifacts and generated code). This should fix that.
@JohnTitor
Rollup merge ofrust-lang#68711- hman523:fix-68593, r=Dylan-DPC
5cc0dc5
Added upper bound of what vecs and boxes can allocate
Fixed issue rust-lang#68593
I added a line of documentation to these two files to reflect that vectors and boxes ensure that they never allocate more than `isize::MAX` bytes.
r? @steveklabnik
@JohnTitor
Rollup merge ofrust-lang#68727- xfix:remove-comment-about-pretty-pr…
b316aad
…inter-in-format-tests, r=jonas-schievink
Remove a comment about pretty printer in formatting tests
rustc is now using rustfmt, not the old formatter.
@JohnTitor
Rollup merge ofrust-lang#68740- JohnTitor:do-not-sugg-underscore, r…
b6efab8
…=Centril
Do not suggest things named underscore
Fixesrust-lang#68719
r? @estebank
@JohnTitor

JohnTitor commented Feb 1, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=7 rollup=never

@bors

bors commented Feb 1, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b6efab8 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 1, 2020
@bors

bors commented Feb 1, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b6efab8 with merge ba1394d84b529447279206477a35009e844f330f...

@JohnTitorJohnTitor added the rollup A PR which is a rollup label Feb 1, 2020
@rust-highfive

rust-highfive commented Feb 1, 2020

Copy link
Copy Markdown
Contributor

The job x86_64-apple of your PR failed (pretty log, 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.
2020-02-01T23:21:52.6133070Z ---- [js-doc-test] rustdoc-js/struct-like-variant.rs stdout ----
2020-02-01T23:21:52.6133140Z 2020-02-01T23:21:52.6133620Z error: rustdoc-js test failed!
2020-02-01T23:21:52.6133710Z status: exit code: 1
2020-02-01T23:21:52.6134590Z command: "/usr/local/bin/node" "/Users/runner/runners/2.164.6/work/1/s/src/tools/rustdoc-js/tester.js" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/test/rustdoc-js" "struct-like-variant"
2020-02-01T23:21:52.6135310Z ------------------------------------------
2020-02-01T23:21:52.6135820Z Checking "struct-like-variant" ... 2020-02-01T23:21:52.6135870Z 2020-02-01T23:21:52.6136350Z ------------------------------------------
2020-02-01T23:21:52.6136350Z ------------------------------------------
2020-02-01T23:21:52.6136450Z stderr:
2020-02-01T23:21:52.6136940Z ------------------------------------------
2020-02-01T23:21:52.6137020Z FAILED
2020-02-01T23:21:52.6137570Z ==> Result not found in 'others': '{"path":"struct_like_variant::Enum::Bar::name","name":"l"}'
2020-02-01T23:21:52.6138140Z ------------------------------------------
2020-02-01T23:21:52.6138220Z 2020-02-01T23:21:52.6138250Z 2020-02-01T23:21:52.6138290Z ---
2020-02-01T23:21:52.6140090Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-01T23:21:52.6140220Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-02-01T23:21:52.6140310Z 2020-02-01T23:21:52.6140350Z 2020-02-01T23:21:52.6143030Z command did not execute successfully: "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage0-tools-bin/compiletest" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "--rustdoc-path" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustdoc" "--src-base" "/Users/runner/runners/2.164.6/work/1/s/src/test/rustdoc-js" "--build-base" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/test/rustdoc-js" "--stage-id" "stage2-x86_64-apple-darwin" "--mode" "js-doc-test" "--target" "x86_64-apple-darwin" "--host" "x86_64-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Cdebuginfo=0 -Zunstable-options -Lnative=/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Cdebuginfo=0 -Zunstable-options -Lnative=/Users/runner/runners/2.164.6/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-902.0.79.2\n Swift-4.1\n" "--lldb-python-dir" "/Applications/Xcode_9.3.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "9.0.1-rust-1.42.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-01T23:21:52.6144130Z 2020-02-01T23:21:52.6144170Z 2020-02-01T23:21:52.6150650Z failed to run: /Users/runner/runners/2.164.6/work/1/s/build/bootstrap/debug/bootstrap test
2020-02-01T23:21:52.6150810Z Build completed unsuccessfully in 1:27:21
2020-02-01T23:21:52.6150810Z Build completed unsuccessfully in 1:27:21
2020-02-01T23:21:52.6212600Z == clock drift check ==
2020-02-01T23:21:52.6273570Z local time: Sat Feb 1 23:21:52 UTC 2020
2020-02-01T23:21:52.7010630Z network time: Sat, 01 Feb 2020 23:21:52 GMT
2020-02-01T23:21:52.7012280Z == end clock drift check ==
2020-02-01T23:21:52.7052700Z 2020-02-01T23:21:52.7181500Z ##[error]Bash exited with code '1'.
2020-02-01T23:21:52.7222740Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-01T23:21:52.7225620Z ==============================================================================
2020-02-01T23:21:52.7225700Z Task : Get sources
2020-02-01T23:21:52.7225790Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 commented Feb 1, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors 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 Feb 1, 2020
@JohnTitorJohnTitor mentioned this pull request Feb 1, 2020
Merged
@JohnTitor
JohnTitor deleted the rollup-klhrp3c branch February 1, 2020 23:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@JohnTitor@bors@rust-highfive@tomjakubowski@GuillaumeGomez@jbr@jonas-schievink@hman523@sinkuu@sugar700