Rollup of 7 pull requests #66578

Centril · 2019-11-20T17:32:15Z

Successful merges:

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

Failed merges:

r? @ghost

This allows to privatize their fields.

It allows to make most of its fields private

…ng it Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

@eddyb

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

@kinnison

…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 · 2019-11-20T17:32:59Z

@bors r+ p=7 rollup=never

bors · 2019-11-20T17:33:01Z

📌 Commit 8754409 has been approved by Centril

bors · 2019-11-20T18:49:02Z

⌛ Testing commit 8754409 with merge 762a091ea98c2456cfc2c4356a2461585eb4c51b...

rust-highfive · 2019-11-20T18:58:45Z

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 · 2019-11-20T18:58:49Z

💔 Test failed - checks-azure

Centril · 2019-11-20T19:15:19Z

@bors retry spurious I think.

bors · 2019-11-20T19:15:48Z

⌛ Testing commit 8754409 with merge f1b882b...

@ghost

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 · 2019-11-20T22:31:36Z

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

rust-highfive · 2019-11-20T22:32:55Z

📣 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).

@JohnTitor

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).

traxys and others added 30 commits November 3, 2019 16:42

add header to compiletest to check for ice

6299c33

add rustc_error(delay_span_bug_from_inside_query) attribute

32f3fe7

remove another status code check is should-ice

aa028cd

added test for checking that ICEs are not hidden

0f91ed4

tidy

fff3c25

rewrote error messages for #[rustc_error]

f0d2061

was not the same replace as others

9305e60

putting the failure_status code in header.rs

5852a3f

check for sould-ice either in compilefail or incremental cfail

e01d941

rustc_metadata: Move some structs from cstore to decoder

68985c7

This allows to privatize their fields.

rustc_metadata: locator::Context -> CrateLocator

c6bcf60

rustc_metadata: Give a constructor to CrateLocator

bdce69d

rustc_metadata: Give a constructor to CrateMetadata

ff3e06f

rustc_metadata: Minor cleanup

0aed810

rustc_metadata: Give a constructor to CratePaths

41ee980

rustc_metadata: Move CrateMetadata into decoder.rs

c157023

It allows to make most of its fields private

rustc_metadata: Stop leaking Lazy from the rmeta module

09c1c94

rustc_metadata: Remove CrateMetadata::is_proc_macro_crate

26f113e

rustc_metadata: Cleanup crate search with exact paths

febde53

Fix selected crate search filter

00ef5c1

Avoid ICE when breaking to an unreachable label

31620fb

Derive HashStable in librustc.

e00ebd7

More HashStable.

c4bc3f0

More HashStable.

781866f

Derive HashStable more.

e1522fa

Derive HashStable in librustc_mir.

d9eaaf5

Fix project syntax.

7db84e8

Fix derive syntax.

4da5fe7

Revert expansion of impl HashStable for Frame.

579625b

rustdoc: fixes rust-lang#64305: disable search field instead of hiddi…

5cbd406

…ng it Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

Centril added 4 commits November 20, 2019 18:32

Rollup merge of rust-lang#66514 - GuillaumeGomez:fix-search-filter-sa…

4bd9168

…ve, r=kinnison Fix selected crate search filter Fixes rust-lang#62929. r? @kinnison

Rollup merge of rust-lang#66535 - estebank:issue-62480, r=matthewjasper

52ed2c6

Avoid ICE when `break`ing to an unreachable label Fix rust-lang#62480.

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 added the rollup A PR which is a rollup label Nov 20, 2019

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

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 added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2019

bors merged commit 8754409 into rust-lang:master Nov 20, 2019

bors mentioned this pull request Nov 20, 2019

replace the leak check with universes, take 2 #65232

Merged

Centril deleted the rollup-pgz1v7t branch November 20, 2019 22:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #66578

Rollup of 7 pull requests #66578

Centril commented Nov 20, 2019

Centril commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

bors commented Nov 20, 2019

Centril commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

Rollup of 7 pull requests #66578

Rollup of 7 pull requests #66578

Conversation

Centril commented Nov 20, 2019

Centril commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019

bors commented Nov 20, 2019

Centril commented Nov 20, 2019

bors commented Nov 20, 2019

bors commented Nov 20, 2019

rust-highfive commented Nov 20, 2019