Rollup of 7 pull requests by Centril · Pull Request #67111 · rust-lang/rust

Centril · 2019-12-07T02:48:05Z

Successful merges:

remove dependency from libhermit #66730 (remove dependency from libhermit)
Standard library support for riscv64gc-unknown-linux-gnu #66899 (Standard library support for riscv64gc-unknown-linux-gnu)
Miri core engine: use throw_ub instead of throw_panic #66927 (Miri core engine: use throw_ub instead of throw_panic)
Move clean types into their own file #66984 (Move clean types into their own file)
Cleanup BodyCache #66991 (Cleanup BodyCache)
Fix TypedArena returning wrong pointers for recursive allocations #67003 (Fix TypedArena returning wrong pointers for recursive allocations)
Do not ICE on async fn with non-Copy infered type arg #67004 (Do not ICE on async fn with non-Copy infered type arg)

Failed merges:

The build process of the unikernel HermitCore is redesigned and doesn't longer depend on libhermit.

…nneeded Index impl, remove body fn rustc_codegen_ssa: Fix BodyAndCache reborrow to Body and change instances of body() call to derefence rustc_mir: Fix BodyAndCache reborrow to Body and change intances of body() call to derefence

Fix rust-lang#66958.

remove dependency from libhermit The build process of the unikernel HermitCore is redesigned and doesn't longer depend on libhermit.

@alexcrichton

Standard library support for riscv64gc-unknown-linux-gnu Add std support for RISC-V 64-bit GNU/Linux and update libc for RISC-V support. r? @alexcrichton

@oli-obk

Miri core engine: use throw_ub instead of throw_panic See rust-lang#66902 for context: panicking is not really an "interpreter error", but just part of a normal Rust execution. This is a first step towards removing the `InterpError::Panic` variant: the core Miri engine does not use it any more. ConstProp and ConstEval still use it, though. This will be addressed in future PRs. From what I can tell, all the error messages this removes are actually duplicates. r? @oli-obk @wesleywiser

@kinnison

…kinnison Move clean types into their own file This PR is just about moving clean types into their own files to make the code more clear and keep all `Clean` trait implementations on their own. r? @kinnison

@eddyb

Cleanup BodyCache After this PR: - `BodyCache` is renamed to `BodyAndCache` - `ReadOnlyBodyCache` is renamed to `ReadOnlyBodyAndCache` - `ReadOnlyBodyAndCache::body` fn is removed and all calls to it are replaced by a deref (possible due to fix of its `Deref` imp in rust-lang#65947) cc @eddyb @oli-obk

Fix TypedArena returning wrong pointers for recursive allocations Closes rust-lang#67001

Do not ICE on async fn with non-Copy infered type arg Fix rust-lang#66958.

Centril · 2019-12-07T02:48:22Z

@bors r+ p=7 rollup=never

bors · 2019-12-07T02:48:23Z

📌 Commit 6c2232d has been approved by Centril

bors · 2019-12-07T05:52:59Z

⌛ Testing commit 6c2232d with merge c74d2fa4e260d42d4f9e86735f8291174a086c15...

rust-highfive · 2019-12-07T08:15:14Z

The job x86_64-msvc-1 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.

2019-12-07T05:54:20.1516342Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-07T05:54:20.1516658Z 
2019-12-07T05:54:20.1516813Z   git checkout -b <new-branch-name>
2019-12-07T05:54:20.1517081Z 
2019-12-07T05:54:20.1517289Z HEAD is now at c74d2fa4e Auto merge of #67111 - Centril:rollup-gtd4sad, r=Centril
2019-12-07T05:54:20.1918211Z ##[section]Starting: Setup environment
2019-12-07T05:54:20.2031330Z ==============================================================================
2019-12-07T05:54:20.2031430Z Task         : Bash
2019-12-07T05:54:20.2031496Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-07T05:54:21.7967093Z  - #66899 (Standard library support for riscv64gc-unknown-linux-gnu)
2019-12-07T05:54:21.7967391Z  - #66927 (Miri core engine: use throw_ub instead of throw_panic)
2019-12-07T05:54:21.7967507Z  - #66984 (Move clean types into their own file)
2019-12-07T05:54:21.7967741Z  - #66991 (Cleanup BodyCache)
2019-12-07T05:54:21.7967846Z  - #67003 (Fix TypedArena returning wrong pointers for recursive allocations)
2019-12-07T05:54:21.7968101Z AGENT_BUILDDIRECTORY=D:\a\1
2019-12-07T05:54:21.7968180Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-12-07T05:54:21.7968280Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
2019-12-07T05:54:21.7968371Z AGENT_HOMEDIRECTORY=C:\agents\2.160.1
---
2019-12-07T05:54:21.7981278Z BUILD_SOURCEBRANCHNAME=auto
2019-12-07T05:54:21.7981340Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-07T05:54:21.7981436Z BUILD_SOURCEVERSION=c74d2fa4e260d42d4f9e86735f8291174a086c15
2019-12-07T05:54:21.7981506Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-07T05:54:21.7981654Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #67111 - Centril:rollup-gtd4sad, r=Centril
2019-12-07T05:54:21.7981820Z CI_JOB_NAME=x86_64-msvc-1
2019-12-07T05:54:21.7981902Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-07T05:54:21.7981974Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-07T05:54:21.7982074Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-07T08:08:19.1933308Z command did not execute successfully: "D:\\a\\1\\s\\build\\bootstrap/debug/rustdoc" "--test" "D:\\a\\1\\s\\src/doc/rustdoc\\src\\documentation-tests.md" "--test-args" ""
2019-12-07T08:08:19.1933430Z expected success, got: exit code: 101
2019-12-07T08:08:19.1933471Z 
2019-12-07T08:08:19.1933499Z 
2019-12-07T08:08:19.2828657Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail --exclude src/tools/linkchecker
2019-12-07T08:08:19.2828814Z Build completed unsuccessfully in 2:02:42
2019-12-07T08:08:19.3762399Z make: *** [Makefile:80: ci-subset-1] Error 1
2019-12-07T08:08:19.4252782Z   local time: Sat Dec  7 08:08:19 CUT 2019
2019-12-07T08:08:19.8953729Z   network time: Sat, 07 Dec 2019 08:08:19 GMT
2019-12-07T08:08:19.8978383Z == end clock drift check ==
2019-12-07T08:08:20.0073863Z 
2019-12-07T08:08:20.0073863Z 
2019-12-07T08:08:20.4177103Z ##[error]Bash exited with code '2'.
2019-12-07T08:08:20.4847497Z ##[section]Starting: Checkout
2019-12-07T08:08:20.5775416Z ==============================================================================
2019-12-07T08:08:20.5775551Z Task         : Get sources
2019-12-07T08:08:20.5775635Z 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-12-07T08:15:22Z

💔 Test failed - checks-azure

stlankes and others added 26 commits November 25, 2019 08:59

remove dependency from libhermit

c874789

The build process of the unikernel HermitCore is redesigned and doesn't longer depend on libhermit.

Add support for RISC-V 64-bit GNU/Linux

e4b2cb8

Update libc

930a0a2

Miri core engine: use throw_ub instead of throw_panic

a725a15

fix compile-fail tests

15f159a

Create new types.rs file

c0e78d6

remove code that doesn't belong in clean/mod.rs anymore

72fdce2

Fix TypedArena.

d84eb50

remove code that doesn't belong in clean/types.rs

81e549c

fixup clean/types.rs imports

db0e6cd

Make some private methods public

91e021a

Make some formatting improvements

f5e0d0c

Make Lifetime struct field public

e14eebb

Remove unused constant

12a2671

rustc_mir: Fix tidy line lengths

9a21f6e

rustc_codegen_ssa: Fix line accidentally reverted during rebase

a5e144b

Do not ICE on async fn with non-Copy infered type arg

0f306a7

Fix rust-lang#66958.

review comments

7ed9066

Rollup merge of rust-lang#66730 - hermitcore:master, r=alexcrichton

183375f

remove dependency from libhermit The build process of the unikernel HermitCore is redesigned and doesn't longer depend on libhermit.

Rollup merge of rust-lang#66899 - msizanoen1:riscv-std, r=alexcrichton

296ecab

Standard library support for riscv64gc-unknown-linux-gnu Add std support for RISC-V 64-bit GNU/Linux and update libc for RISC-V support. r? @alexcrichton

Rollup merge of rust-lang#66984 - GuillaumeGomez:move-clean-types, r=…

1f029e7

…kinnison Move clean types into their own file This PR is just about moving clean types into their own files to make the code more clear and keep all `Clean` trait implementations on their own. r? @kinnison

Rollup merge of rust-lang#67003 - cjgillot:corrida, r=Mark-Simulacrum

b8ab423

Fix TypedArena returning wrong pointers for recursive allocations Closes rust-lang#67001

Rollup merge of rust-lang#67004 - estebank:issue-66958, r=eddyb

6c2232d

Do not ICE on async fn with non-Copy infered type arg Fix rust-lang#66958.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 7, 2019

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

Centril mentioned this pull request Dec 7, 2019

Move clean types into their own file #66984

Merged

Centril closed this Dec 7, 2019

Centril deleted the rollup-gtd4sad branch December 7, 2019 08:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#67111

Rollup of 7 pull requests#67111
Centril wants to merge 26 commits intorust-lang:masterfrom
Centril:rollup-gtd4sad

Centril commented Dec 7, 2019

Uh oh!

Centril commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

rust-highfive commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

Centril commented Dec 7, 2019

Uh oh!

Centril commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

rust-highfive commented Dec 7, 2019

Uh oh!

bors commented Dec 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants