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 10 pull requests #65702

Closed
wants to merge 31 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 30 commits October 11, 2019 10:40
Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
Co-Authored-By: Ralf Jung <post@ralfj.de>
`TokenStream` used to be a complex type, but it is now just a newtype
around a `Lrc<Vec<TreeAndJoint>>`. Currently it uses custom encoding
that discards the `IsJoint` and custom decoding that adds `NonJoint`
back in for every token tree. This requires building intermediate
`Vec<TokenTree>`s.

This commit makes `TokenStream` derive `Rustc{En,De}codable`. This
simplifies the code, and avoids the creation of the intermediate
vectors, saving up to 3% on various benchmarks. It also changes the AST
JSON output in one test.
This makes a few code cleanups to follow up on the review comments in
rust-lang#65576.
…ng,nikic

Make <*const/mut T>::offset_from `const fn`

This reenables offset_of cc @mjbshaw 	after rust-lang#63075 broke it
…ables, r=michaelwoerister

rustc_metadata: use a table for super_predicates, fn_sig, impl_trait_ref.

This is an attempt at a part of rust-lang#65407, i.e. moving parts of cross-crate "metadata" into tables that match queries more closely.

Three new tables should be enough to see some perf/metadata size changes.
(need to do something similar to rust-lang#59953 (comment))

There are other bits of data that could be made into tables, but they can be more compact so the impact would likely be not as bad, and they're also more work to set up.
Fix WASI sleep impl

Closes rust-lang#65607

@sunfishcode
Is it fine to use 0 for the `identifier` field? What is this field used for?
…dable-Decodable, r=petrochenkov

Derive `Rustc{En,De}codable` for `TokenStream`.

`TokenStream` used to be a complex type, but it is now just a newtype
around a `Lrc<Vec<TreeAndJoint>>`. Currently it uses custom encoding
that discards the `IsJoint` and custom decoding that adds `NonJoint`
back in for every token tree. This requires building intermediate
`Vec<TokenTree>`s.

This commit makes `TokenStream` derive `Rustc{En,De}codable`. This
simplifies the code, and avoids the creation of the intermediate
vectors, saving up to 3% on various benchmarks. It also changes the AST
JSON output in one test.

r? @petrochenkov
…cut, r=Dylan-DPC

Add option to disable keyboard shortcuts in docs

Fixes rust-lang#65211.

r? @Manishearth
Code cleanups following up on rust-lang#65576.

This makes a few code cleanups to follow up on the review comments in
rust-lang#65576.

r? @Centril
Add some tests for fixed ICEs

Fixes rust-lang#41366 from 1.35.0
Fixes rust-lang#51431 from 1.31.0-nightly (77af314 2018-10-11) (on my local)
Fixes rust-lang#52437 from nightly
Fixes rust-lang#63496 from nightly

r? @Centril
bring back some Debug instances for Miri

These were erroneously removed in rust-lang#65647, but Miri needs them.

r? @Centril Cc @nnethercote @oli-obk
…-work-item-event-names, r=wesleywiser

self-profiling: Remove module names from some event-ids in codegen backend.

Event-IDs are not supposed to contain argument values. Event-IDs are the equivalent of function names. Proper support for parameters will be added to self-profiling down the line.

This PR fixes an oversight from rust-lang#64840.

r? @wesleywiser
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Oct 22, 2019

📌 Commit d63e1a8 has been approved by JohnTitor

@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 Oct 22, 2019
@JohnTitor JohnTitor added the rollup A PR which is a rollup label Oct 22, 2019
@bors
Copy link
Contributor

bors commented Oct 22, 2019

⌛ Testing commit d63e1a8 with merge 40efa02d791b8f2a26290ed071007b1d6b95ffbc...

@rust-highfive
Copy link
Collaborator

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.
2019-10-22T18:51:44.2558529Z do so (now or later) by using -b with the checkout command again. Example:
2019-10-22T18:51:44.2558988Z 
2019-10-22T18:51:44.2559452Z   git checkout -b <new-branch-name>
2019-10-22T18:51:44.2559985Z 
2019-10-22T18:51:44.2560405Z HEAD is now at 40efa02d7 Auto merge of #65702 - JohnTitor:rollup-5014hez, r=JohnTitor
2019-10-22T18:51:44.2948710Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-10-22T18:51:44.3063747Z ==============================================================================
2019-10-22T18:51:44.3063860Z Task         : Bash
2019-10-22T18:51:44.3063963Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-22T18:51:46.1319516Z ==============================================================================
2019-10-22T18:51:49.9906875Z Generating script.
2019-10-22T18:51:50.0488550Z ========================== Starting Command Output ===========================
2019-10-22T18:51:50.0955743Z ##[command]"C:\windows\system32\cmd.exe" /D /E:ON /V:OFF /S /C "CALL "D:\a\_temp\5a9f90a7-9aab-4f10-8e23-57fc81a5c3ba.cmd""
2019-10-22T18:52:02.2033050Z iwr : The remote name could not be resolved: 'rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com'
2019-10-22T18:52:02.2033943Z At line:1 char:43
2019-10-22T18:52:02.2034228Z + ... yContinue'; iwr -outf sccache\sccache.exe https://rust-lang-ci-mirror ...
2019-10-22T18:52:02.2034440Z +                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2019-10-22T18:52:02.2034644Z     + CategoryInfo          : InvalidOperation: (System.Net.HttpWebRequest:HttpWebRequest) [Invoke-WebRequest], WebExc 
2019-10-22T18:52:02.2034849Z    eption
2019-10-22T18:52:02.2035056Z     + FullyQualifiedErrorId : WebCmdletWebResponseException,Microsoft.PowerShell.Commands.InvokeWebRequestCommand
2019-10-22T18:52:02.2035231Z  
2019-10-22T18:52:02.3381151Z ##[error]Cmd.exe exited with code '1'.
2019-10-22T18:52:02.4174365Z ##[section]Starting: Upload CPU usage statistics
2019-10-22T18:52:02.4300165Z ==============================================================================
2019-10-22T18:52:02.4300286Z Task         : Bash
2019-10-22T18:52:02.4300380Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-22T18:52:02.7475403Z ========================== Starting Command Output ===========================
2019-10-22T18:52:02.7481176Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/66829b3c-273b-492e-9eb2-ed58a4272b41.sh
2019-10-22T18:52:02.7942241Z /d/a/_temp/66829b3c-273b-492e-9eb2-ed58a4272b41.sh: line 1: aws: command not found
2019-10-22T18:52:02.7978807Z 
2019-10-22T18:52:02.7994562Z ##[error]Bash exited with code '127'.
2019-10-22T18:52:02.8073746Z ##[section]Starting: Checkout
2019-10-22T18:52:02.8185439Z ==============================================================================
2019-10-22T18:52:02.8185541Z Task         : Get sources
2019-10-22T18:52:02.8185617Z 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
Copy link
Contributor

bors commented Oct 22, 2019

💔 Test failed - checks-azure

@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 Oct 22, 2019
@JohnTitor JohnTitor closed this Oct 23, 2019
@JohnTitor JohnTitor deleted the rollup-5014hez branch October 23, 2019 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.