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 8 pull requests #63380

Merged
merged 20 commits into from
Aug 8, 2019
Merged

Rollup of 8 pull requests #63380

merged 20 commits into from
Aug 8, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 8, 2019

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 20 commits August 4, 2019 14:50
bump rand in libcore/liballoc test suites

This pulls in the fix for rust-random/rand#779, which trips Miri when running these test suites.

`SmallRng` (formerly used by libcore) is no longer built by default, it needs a feature gate. I opted to switch to `StdRng` instead. Or should I enable the feature gate?
…imulacrum

Update rustfmt to 1.4.4

The update includes bug fixes.
Add an overflow check in truncate implementation for Unix.

Closes rust-lang#63326.
cc @alexcrichton
…ichton

Don't use remap-path-prefix in dep-info files.

This changes it so that dep-info files do not use remapped paths.

Having remapped paths causes problems with Cargo because if you remap to a nonexistent path (like `/rustc/$HASH` which rustc distributions do), then Cargo's change tracking thinks the files don't exist and will always rebuild.

I don't actually know if this is a good idea. I think it makes sense, but I do not know what the exact requirements are for reproducible builds. I consider these files separate from the binary artifacts generated, and as a build-system helper, so it seems reasonable to me.

I'm also not sure if this needs a test. I'll definitely add one on the cargo side if this is merged.

Closes rust-lang#63329
…r=Centril

doc: Fix typo in float from bytes methods

Thanks @That3Percent for pointing it out.
r? @Centril
Improved documentation for compile_error!()

Fixes rust-lang#63375
@Centril
Copy link
Contributor Author

Centril commented Aug 8, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Aug 8, 2019

📌 Commit 3de450b 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 Aug 8, 2019
@bors
Copy link
Contributor

bors commented Aug 8, 2019

⌛ Testing commit 3de450b with merge c215a1de6ce23d152a8303b6c95f63d420eaffea...

@rust-highfive
Copy link
Collaborator

Your PR failed (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-08-08T17:14:05.6220111Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-08T17:14:05.6221655Z 
2019-08-08T17:14:05.6222427Z   git checkout -b <new-branch-name>
2019-08-08T17:14:05.6222725Z 
2019-08-08T17:14:05.6223313Z HEAD is now at c215a1de6 Auto merge of #63380 - Centril:rollup-tzfhtnu, r=Centril
2019-08-08T17:14:05.6408039Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-08T17:14:05.6421288Z ==============================================================================
2019-08-08T17:14:05.6421383Z Task         : Bash
2019-08-08T17:14:05.6421470Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-08T17:15:13.5156339Z Script contents:
2019-08-08T17:15:13.5156852Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$SYSTEM_JOBNAME.csv
2019-08-08T17:15:13.5157247Z ========================== Starting Command Output ===========================
2019-08-08T17:15:13.5159713Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/c9d1048b-2c14-4c99-b9da-00cf5d3c808d.sh
2019-08-08T17:15:13.5160147Z /home/vsts/work/_temp/c9d1048b-2c14-4c99-b9da-00cf5d3c808d.sh: line 1: aws: command not found
2019-08-08T17:15:13.5161196Z ##[error]Bash exited with code '127'.
2019-08-08T17:15:13.5176300Z ##[section]Starting: Checkout
2019-08-08T17:15:13.5178363Z ==============================================================================
2019-08-08T17:15:13.5178516Z Task         : Get sources
2019-08-08T17:15:13.5178649Z 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 Aug 8, 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 Aug 8, 2019
@Centril
Copy link
Contributor Author

Centril commented Aug 8, 2019

@bors retry spurious network.

@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 Aug 8, 2019
@bors
Copy link
Contributor

bors commented Aug 8, 2019

⌛ Testing commit 3de450b with merge 2d1a551...

bors added a commit that referenced this pull request Aug 8, 2019
Rollup of 8 pull requests

Successful merges:

 - #63261 (bump rand in libcore/liballoc test suites)
 - #63316 (Update rustfmt to 1.4.4)
 - #63332 (Add an overflow check in truncate implementation for Unix.)
 - #63342 (Don't use remap-path-prefix in dep-info files.)
 - #63366 (doc: Fix typo in float from bytes methods)
 - #63370 (Fix ICE #63364)
 - #63377 (Improved documentation for compile_error!())
 - #63379 (Add test for issue 53096)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 8, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2019
@bors bors merged commit 3de450b into rust-lang:master Aug 8, 2019
@Centril Centril deleted the rollup-tzfhtnu branch August 8, 2019 21:00
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
pchickey added a commit to bytecodealliance/wasmtime that referenced this pull request Aug 26, 2020
issue now closed: rust-lang/rust#63326
fix landed in a rollup: rust-lang/rust#63380 merged aug 8, 2019
rust 1.38 beta cut on aug 15, 2019: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
pchickey added a commit to bytecodealliance/wasmtime that referenced this pull request Aug 26, 2020
issue now closed: rust-lang/rust#63326
fix landed in a rollup: rust-lang/rust#63380 merged aug 8, 2019
rust 1.38 beta cut on aug 15, 2019: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
minimum supported rust version for this repo is currently 1.41.
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.