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

Rollup of 4 pull requests #74133

Closed
wants to merge 8 commits into from
Closed

Rollup of 4 pull requests #74133

wants to merge 8 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 8 commits July 3, 2020 13:22
@RalfJung
adjust ub-enum test to be endianess-independent
fb9fa5b
@euclio
libstd: remove some mutable statics in sys::unix
792f2de
@ehuss
Fix occasional bootstrap panic in docs.
561d5ac
@matklad
⬆️ rust-analyzer
b82df31
@Manishearth
Rollup merge of rust-lang#73989 - RalfJung:ub-enum-test, r=oli-obk
5cd6d89 
adjust ub-enum test to be endianess-independent

@cuviper noted that our test fails on "other" endianess systems (I never know which is which^^), so let's fix that.
@Manishearth
Rollup merge of rust-lang#74006 - euclio:sys-unix-static-mut, r=oli-obk
f2a5068 
libstd: remove some mutable statics in sys::unix

My understanding is that this achieves the same behavior and performance with safe code.
@Manishearth
Rollup merge of rust-lang#74124 - ehuss:fix-doc-dry-run-up-to-date, r…
6ceaaf4 
…=Mark-Simulacrum

Fix occasional bootstrap panic in docs.

I am occasionally running into this panic when running `x.py`:

> thread 'main' panicked at 'source "/Users/eric/Proj/rust/rust/build/x86_64-apple-darwin/md-doc/unstable-book" failed to get metadata: No such file or directory (os error 2)', src/build_helper/lib.rs:173:19

I have not been able to figure out the exact sequence of commands that leads to this error (I tried for quite a while to reproduce it). I think it may involve updating my tree, but I am uncertain.  An artificial way to trigger it is to build the documentation, and then delete the `md-doc` directory manually.

The cause is that bootstrap does a "dry run" before every command, and in this case `up_to_date` panics because the destination exists (`build/x86_64-apple-darwin/doc/unstable-book/index.html `) but the source does not (`build/x86_64-apple-darwin/md-doc/unstable-book`).

I am uncertain if it is important that the last line `builder.run(…)` needs to be called during the dry run. This patch seems to fix the issue, though.
@Manishearth
Rollup merge of rust-lang#74129 - matklad:rust-analyzer-2020-07-07, r…
ed007c9 
…=Mark-Simulacrum

⬆️ rust-analyzer

This updates rust-analyzer submodule to the latest release.

I plan to do that every Monday after rust-analyzer release (about 16:00 CET).

This is semi-automated by https://github.com/rust-analyzer/rust-analyzer/pull/5253/files#diff-c06f6a9cbd0ad2421bcc2ddc28805457R77-R100.

Who would be the appropriate person to r? on Mondays?
@Manishearth
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 7, 2020

📌 Commit ed007c9 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 7, 2020
@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 Jul 7, 2020
@bors
Copy link
Contributor

bors commented Jul 7, 2020

⌛ Testing commit ed007c9 with merge 43466663f049cf62e3568e38480ef0bbf5f2b6d2...

@bors
Copy link
Contributor

bors commented Jul 7, 2020

💔 Test failed - checks-actions

@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 Jul 7, 2020
@Manishearth
Copy link
Member Author 

2020-07-07T19:34:06.0985373Z 
2020-07-07T19:34:06.0985883Z failures:
2020-07-07T19:34:06.0986029Z 
2020-07-07T19:34:06.0986639Z ---- [ui] ui/issues/issue-25279.rs stdout ----
2020-07-07T19:34:06.0986749Z 
2020-07-07T19:34:06.0986890Z error: test run failed!
2020-07-07T19:34:06.0987074Z status: exit code: 1
2020-07-07T19:34:06.0987566Z command: "/node-v14.4.0-linux-x64/bin/node" "/checkout/src/etc/wasm32-shim.js" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-25279/a.wasm"
2020-07-07T19:34:06.0987763Z stdout:
2020-07-07T19:34:06.0988066Z ------------------------------------------
2020-07-07T19:34:06.0988163Z 
2020-07-07T19:34:06.0988452Z ------------------------------------------
2020-07-07T19:34:06.0990977Z stderr:
2020-07-07T19:34:06.0991949Z ------------------------------------------
2020-07-07T19:34:06.0992235Z internal/process/per_thread.js:258
2020-07-07T19:34:06.0992512Z   for (const [ from, expansion ] of aliases) {
2020-07-07T19:34:06.0992799Z                                     ^
2020-07-07T19:34:06.0993003Z 
2020-07-07T19:34:06.0993243Z TypeError: aliases is not iterable
2020-07-07T19:34:06.0993532Z     at Object.buildAllowedFlags (internal/process/per_thread.js:258:37)
2020-07-07T19:34:06.0993883Z     at process.get [as allowedNodeEnvironmentFlags] (internal/bootstrap/node.js:160:34)
2020-07-07T19:34:06.0994183Z     at get (<anonymous>)
2020-07-07T19:34:06.0994454Z     at getOwn (internal/bootstrap/loaders.js:150:5)
2020-07-07T19:34:06.0994763Z     at NativeModule.syncExports (internal/bootstrap/loaders.js:258:31)
2020-07-07T19:34:06.0995085Z     at ModuleWrap.<anonymous> (internal/bootstrap/loaders.js:238:22)
2020-07-07T19:34:06.0995409Z     at NativeModule.getESMFacade (internal/bootstrap/loaders.js:243:17)
2020-07-07T19:34:06.0995769Z     at NativeModule.compileForPublicLoader (internal/bootstrap/loaders.js:225:10)
2020-07-07T19:34:06.0996103Z     at loadNativeModule (internal/modules/cjs/helpers.js:25:9)
2020-07-07T19:34:06.0996424Z     at Function.Module._load (internal/modules/cjs/loader.js:908:15)
2020-07-07T19:34:06.0996594Z 
2020-07-07T19:34:06.0997148Z ------------------------------------------
2020-07-07T19:34:06.0997625Z 
2020-07-07T19:34:06.0997761Z 
2020-07-07T19:34:06.0997876Z 
2020-07-07T19:34:06.0998102Z failures:
2020-07-07T19:34:06.0998644Z     [ui] ui/issues/issue-25279.rs
2020-07-07T19:34:06.0998809Z 
2020-07-07T19:34:06.0999456Z test result: �[31mFAILED�(B�[m. 9893 passed; 1 failed; 547 ignored; 0 measured; 0 filtered out
2020-07-07T19:34:06.0999635Z 
2020-07-07T19:34:06.1034305Z thread 'main' panicked at 'Some t

@Manishearth Manishearth closed this Jul 7, 2020
@Manishearth Manishearth deleted the rollup-7ngwjal branch July 18, 2020 01:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: 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.
7 participants
@Manishearth @bors @rustbot @RalfJung @euclio @ehuss @matklad