[beta] Rollup of 2 pull requests - #41051

frewsxcv · 2017-04-03T23:32:19Z

Successful merges: [beta] Beta next #41016, [beta] Backport #41045: switch to vault.centos.org #41048
Failed merges:

When the Range expression is the root of a constant, its node-id is used for the def-id of the body, so it has to be preserved in the AST -> HIR lowering. Fixes rust-lang#40749.

LLVM has a bug - PR32488 - where it fails to deduplicate allocas in some circumstances. The function `start_new_block` has allocas totalling 1216 bytes, and when LLVM inlines several copies of that function into the recursive function `expr::into`, that function's stack space usage goes into tens of kiBs, causing stack overflows. Mark `start_new_block` as inline(never) to keep it from being inlined, getting stack usage under control. Fixes rust-lang#40493. Fixes rust-lang#40573.

Looks like the last version was built with mio 0.6.5 which now has known bugs against it. This build includes mio 0.6.6

…l mirrors

@brson

[beta] Beta next - rust-lang#40764 - rust-lang#40809 - rust-lang#41015 r? @brson

@alexcrichton

…chton [beta] Backport rust-lang#41045: switch to vault.centos.org r? @alexcrichton

rust-highfive · 2017-04-03T23:32:31Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

rust-highfive · 2017-04-03T23:32:32Z

Warning

Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

frewsxcv · 2017-04-03T23:32:35Z

@bors r+ p=15

bors · 2017-04-03T23:32:36Z

📌 Commit 68fcad8 has been approved by frewsxcv

bors · 2017-04-04T00:17:26Z

⌛ Testing commit 68fcad8 with merge 66d192e...

bors · 2017-04-04T00:36:37Z

💔 Test failed - status-appveyor

alexcrichton · 2017-04-04T00:42:16Z

@bors: retry * ar.exe error #40546

…

On Mon, Apr 3, 2017 at 6:36 PM, bors ***@***.***> wrote: 💔 Test failed - status-appveyor <https://ci.appveyor.com/project/rust-lang/rust/build/1.0.2722> — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#41051 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95KfUhXwNXuk8bQJyI11I9F6eol0vks5rsZCXgaJpZM4MyN_C> .

bors · 2017-04-04T03:52:37Z

⌛ Testing commit 68fcad8 with merge 368d709...

bors · 2017-04-04T04:14:06Z

💔 Test failed - status-travis

frewsxcv · 2017-04-04T04:15:48Z

[  9%] Linking CXX static library ../libLLVMSupport.a

/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: file: CMakeFiles/LLVMSupport.dir/ThreadPool.cpp.o has no symbols

[  9%] Built target LLVMSupport

make[1]: *** [all] Error 2

thread 'main' panicked at '

command did not execute successfully, got: exit code: 2

build script failed, must exit now', /Users/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.21/src/lib.rs:605

note: Run with `RUST_BACKTRACE=1` for a backtrace.

	finished in 72.799

Build completed unsuccessfully in 0:01:32

make: *** [all] Error 101

@bors retry

bors · 2017-04-04T04:38:18Z

⌛ Testing commit 68fcad8 with merge f5a87a6...

bors · 2017-04-04T05:02:07Z

💔 Test failed - status-travis

frewsxcv · 2017-04-04T05:08:32Z

@bors retry

bors · 2017-04-04T08:02:35Z

⌛ Testing commit 68fcad8 with merge ebbe365...

TimNN · 2017-04-04T08:03:49Z

@bors retry

(Try #41045 again first, to hopefully prevent any caches from possibly being invalidated by building another branch).

bors · 2017-04-04T08:32:16Z

⌛ Testing commit 68fcad8 with merge fced6c1...

TimNN · 2017-04-04T08:33:44Z

@bors retry

bors · 2017-04-04T09:10:15Z

⌛ Testing commit 68fcad8 with merge 44bf84f...

TimNN · 2017-04-04T09:12:23Z

@bors retry

bors · 2017-04-04T09:30:58Z

⌛ Testing commit 68fcad8 with merge dcee285...

TimNN · 2017-04-04T09:32:40Z

@bors retry

bors · 2017-04-04T10:04:18Z

⌛ Testing commit 68fcad8 with merge 0973bd0...

TimNN · 2017-04-04T10:06:06Z

@bors retry

bors · 2017-04-04T13:06:29Z

⌛ Testing commit 68fcad8 with merge 06ad8e4...

[beta] Rollup of 2 pull requests - Successful merges: #41016, #41048 - Failed merges:

bors · 2017-04-04T15:47:03Z

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 06ad8e4 to beta...

arielb1 and others added 7 commits April 2, 2017 17:18

keep the AST node-id when lowering ExprKind::Range

4d0119e

When the Range expression is the root of a constant, its node-id is used for the def-id of the body, so it has to be preserved in the AST -> HIR lowering. Fixes rust-lang#40749.

travis: Update sccache again

ab18aae

Looks like the last version was built with mio 0.6.5 which now has known bugs against it. This build includes mio 0.6.6

switch to vault.centos.org

1074aca

use fixed ip for vault.centos.org until updates have propagated to al…

10dc01a

…l mirrors

Rollup merge of rust-lang#41016 - arielb1:beta-fixes, r=alexcrichton

0134608

[beta] Beta next - rust-lang#40764 - rust-lang#40809 - rust-lang#41015 r? @brson

Rollup merge of rust-lang#41048 - TimNN:centos5-vault-beta, r=alexcri…

68fcad8

…chton [beta] Backport rust-lang#41045: switch to vault.centos.org r? @alexcrichton

rust-highfive assigned nrc Apr 3, 2017

frewsxcv changed the title ~~Rollup of 2 pull requests~~ [beta] Rollup of 2 pull requests Apr 3, 2017

bors added a commit that referenced this pull request Apr 4, 2017

Auto merge of #41051 - frewsxcv:rollup, r=frewsxcv

06ad8e4

[beta] Rollup of 2 pull requests - Successful merges: #41016, #41048 - Failed merges:

bors merged commit 68fcad8 into rust-lang:beta Apr 4, 2017

frewsxcv deleted the rollup branch April 4, 2017 15:47

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Uh oh!

Uh oh!

Conversation

frewsxcv commented Apr 3, 2017

Uh oh!

rust-highfive commented Apr 3, 2017

Uh oh!

rust-highfive commented Apr 3, 2017

Uh oh!

frewsxcv commented Apr 3, 2017

Uh oh!

bors commented Apr 3, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

alexcrichton commented Apr 4, 2017 via email

Uh oh!

bors commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

frewsxcv commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

frewsxcv commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

TimNN commented Apr 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Apr 4, 2017

Uh oh!

TimNN commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

TimNN commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

TimNN commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

TimNN commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

bors commented Apr 4, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

TimNN commented Apr 4, 2017 •

edited

Loading