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 #66578

Merged
merged 39 commits into from
Nov 20, 2019
Merged

Rollup of 7 pull requests #66578

merged 39 commits into from
Nov 20, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 20, 2019

Successful merges:

Failed merges:

r? @ghost

traxys and others added 30 commits November 3, 2019 16:42
This allows to privatize their fields.
It allows to make most of its fields private
rustc_metadata: Privatize more things

Continuation of rust-lang#66056.

The most notable change here is that `CrateMetadata` is moved from `cstore.rs` to `decoder.rs`.
Most of uses of `CrateMetadata` fields are in the decoder and uses of `root: CrateRoot` and other fields are so intertwined with each other that it would be hard to move a part of them into `cstore.rs` to privatize `CrateMetadata` fields, so we are going the other way round.

`cstore.rs` can probably be dismantled now, but I'll leave this to some other day.
Similarly, remaining `CrateMetadata` fields can be privatized by introducing some getter/setter methods, but not today.

r? @eddyb
…ve, r=kinnison

Fix selected crate search filter

Fixes rust-lang#62929.

r? @kinnison
Avoid ICE when `break`ing to an unreachable label

Fix rust-lang#62480.
…cible-build-2-on-macos, r=alexcrichton

Ignore run-make reproducible-build-2 on Mac

Ignore run-make reproducible-build-2 on Mac (we already ignore it on Windows).

Until we can dedicate resources to fixing this properly, I think we are best off just ignoring this test on platforms/contexts where it does not matter as much.

cc rust-lang#66568
@Centril
Copy link
Contributor Author

Centril commented Nov 20, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Nov 20, 2019

📌 Commit 8754409 has been approved by Centril

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

bors commented Nov 20, 2019

⌛ Testing commit 8754409 with merge 762a091ea98c2456cfc2c4356a2461585eb4c51b...

@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-11-20T18:50:28.4756369Z do so (now or later) by using -b with the checkout command again. Example:
2019-11-20T18:50:28.4756699Z 
2019-11-20T18:50:28.4757339Z   git checkout -b <new-branch-name>
2019-11-20T18:50:28.4757547Z 
2019-11-20T18:50:28.4757815Z HEAD is now at 762a091ea Auto merge of #66578 - Centril:rollup-pgz1v7t, r=Centril
2019-11-20T18:50:28.5150305Z ##[section]Starting: Decide whether to run this job
2019-11-20T18:50:28.5263335Z ==============================================================================
2019-11-20T18:50:28.5263438Z Task         : Bash
2019-11-20T18:50:28.5263535Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-11-20T18:50:29.9202002Z 
2019-11-20T18:50:29.9202327Z 
2019-11-20T18:50:29.9202642Z 
2019-11-20T18:50:29.9203084Z 
2019-11-20T18:50:29.9203460Z  - #66060 (Making ICEs and test them in incremental)
2019-11-20T18:50:29.9204700Z  - #66298 (rustdoc: fixes #64305: disable search field instead of hidding it)
2019-11-20T18:50:29.9205024Z  - #66457 (Just derive Hashstable in librustc)
2019-11-20T18:50:29.9205674Z  - #66496 (rustc_metadata: Privatize more things)
2019-11-20T18:50:29.9205890Z  - #66514 (Fix selected crate search filter)
2019-11-20T18:50:29.9206094Z  - #66535 (Avoid ICE when `break`ing to an unreachable label)
2019-11-20T18:50:29.9206319Z  - #66573 (Ignore run-make reproducible-build-2 on Mac)
2019-11-20T18:50:29.9208069Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-11-20T18:50:29.9208808Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-11-20T18:50:29.9212604Z AGENT_HOMEDIRECTORY=C:\agents\2.160.1
2019-11-20T18:50:29.9212899Z AGENT_ID=523
---
2019-11-20T18:50:29.9222225Z BUILD_SOURCEBRANCHNAME=auto
2019-11-20T18:50:29.9222297Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-11-20T18:50:29.9222403Z BUILD_SOURCEVERSION=762a091ea98c2456cfc2c4356a2461585eb4c51b
2019-11-20T18:50:29.9222624Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-11-20T18:50:29.9222744Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66578 - Centril:rollup-pgz1v7t, r=Centril
2019-11-20T18:50:29.9222926Z CI_JOB_NAME=x86_64-mingw-2
2019-11-20T18:50:29.9223015Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-11-20T18:50:29.9223097Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-11-20T18:50:29.9223208Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-11-20T18:56:13.3500377Z  10 43.6M   10 4538k    0     0  47077      0  0:16:11  0:01:38  0:14:33     0
2019-11-20T18:56:13.3643111Z  10 43.6M   10 4538k    0     0  47075      0  0:16:11  0:01:38  0:14:33     0
2019-11-20T18:56:13.3645772Z curl: (18) transfer closed with 41088713 bytes remaining to read
2019-11-20T18:56:13.3695863Z 
2019-11-20T18:56:13.3871939Z ##[error]Bash exited with code '18'.
2019-11-20T18:56:13.4032999Z ##[section]Starting: Checkout
2019-11-20T18:56:13.4150767Z ==============================================================================
2019-11-20T18:56:13.4150917Z Task         : Get sources
2019-11-20T18:56:13.4151011Z 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 Nov 20, 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 Nov 20, 2019
@Centril
Copy link
Contributor Author

Centril commented Nov 20, 2019

@bors retry spurious I think.

@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 Nov 20, 2019
@bors
Copy link
Contributor

bors commented Nov 20, 2019

⌛ Testing commit 8754409 with merge f1b882b...

bors added a commit that referenced this pull request Nov 20, 2019
Rollup of 7 pull requests

Successful merges:

 - #66060 (Making ICEs and test them in incremental)
 - #66298 (rustdoc: fixes #64305: disable search field instead of hidding it)
 - #66457 (Just derive Hashstable in librustc)
 - #66496 (rustc_metadata: Privatize more things)
 - #66514 (Fix selected crate search filter)
 - #66535 (Avoid ICE when `break`ing to an unreachable label)
 - #66573 (Ignore run-make reproducible-build-2 on Mac)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 20, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f1b882b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2019
@bors bors merged commit 8754409 into rust-lang:master Nov 20, 2019
@Centril Centril deleted the rollup-pgz1v7t branch November 20, 2019 22:32
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #66578!

Tested on commit f1b882b.
Direct link to PR: #66578

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 20, 2019
Tested on commit rust-lang/rust@f1b882b.
Direct link to PR: <rust-lang/rust#66578>

💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
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.

Instead of hiding rustdoc search bar by default, disable it
10 participants