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.

Sign up for GitHub

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

Jump to bottom

Upgrade rand to 0.7 #63806

Merged
merged 1 commit into from
Sep 10, 2019
Merged

Upgrade rand to 0.7 #63806

merged 1 commit into from
Sep 10, 2019

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Aug 22, 2019 •
edited
Loading

Also upgrades getrandom to avoid bug encountered by #61393 which bumps libc to 0.2.62.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 22, 2019
RalfJung
RalfJung reviewed Aug 26, 2019
View reviewed changes
Cargo.lock Outdated Show resolved Hide resolved
@Kixiron Kixiron added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2019
@mati865 mati865 mentioned this pull request Aug 26, 2019
Closed
@RalfJung
Copy link
Member

RalfJung commented Aug 27, 2019 •
edited
Loading

If I am reading this PR correctly, recent getrandom only support Linux 2.6.22+. That would be a problem as Rust supports 2.6.18+.

@mati865
Copy link
Contributor Author

mati865 commented Aug 27, 2019

It was later decided to add support for older kernels to be on pair with Rust: rust-random/getrandom#58 (comment)
See commit rust-random/getrandom@6a45c49

I'll update this PR once tests pass.

@mati865 mati865 force-pushed the rand branch 2 times, most recently from 18f474c to 74b3548 Compare August 27, 2019 08:46
@mati865

This comment has been minimized.

Sign in to view
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 27, 2019
@mati865 mati865 mentioned this pull request Aug 27, 2019
Closed
@gnzlbg gnzlbg mentioned this pull request Aug 27, 2019
Merged
gnzlbg
gnzlbg approved these changes Aug 27, 2019
View reviewed changes
Copy link
Contributor

@gnzlbg gnzlbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The license of the wasi crate is not Apache2/MIT but Apache2 with LLVM exception. That's compatible with the Rust run-time, so this LGTM.

I've opened an issue with them to try to relicense it also under MIT as well, but that can be done later - and if it for whatever reason it cannot be done, then that's not critical either.

src/tools/tidy/src/deps.rs Outdated Show resolved Hide resolved
@gnzlbg
Copy link
Contributor

gnzlbg commented Aug 28, 2019 •
edited
Loading

@alexcrichton could you review this? I'm not a reviewer for rust-lang/rust

@dhardy dhardy mentioned this pull request Aug 28, 2019
Closed
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 28, 2019

📌 Commit 74b3548 has been approved by alexcrichton

@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 28, 2019
@gnzlbg gnzlbg mentioned this pull request Aug 28, 2019
Merged
@bors
Copy link
Contributor

bors commented Aug 28, 2019

⌛ Testing commit 74b3548 with merge 391cdd3bd50db0e942a08a8d731a02fe879b76ea...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of 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-28T17:27:00.8972807Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-28T17:27:00.8972888Z 
2019-08-28T17:27:00.8973167Z   git checkout -b <new-branch-name>
2019-08-28T17:27:00.8973216Z 
2019-08-28T17:27:00.8973557Z HEAD is now at 391cdd3bd Auto merge of #63806 - mati865:rand, r=alexcrichton
2019-08-28T17:27:00.9139924Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-28T17:27:00.9143569Z ==============================================================================
2019-08-28T17:27:00.9143689Z Task         : Bash
2019-08-28T17:27:00.9143770Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-28T17:42:13.7799358Z tidy check
2019-08-28T17:42:14.6630958Z * 578 error codes
2019-08-28T17:42:14.6631151Z * highest error code: E0733
2019-08-28T17:42:15.0349128Z * 263 features
2019-08-28T17:42:15.4257543Z invalid license Apache-2.0 WITH LLVM-exception in /checkout/obj/build/tmp/distcheck/src/../vendor/wasi/Cargo.toml
2019-08-28T17:42:15.7661427Z some tidy checks failed
2019-08-28T17:42:15.7662684Z 
2019-08-28T17:42:15.7662684Z 
2019-08-28T17:42:15.7663988Z command did not execute successfully: "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/obj/build/tmp/distcheck/src" "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo"
2019-08-28T17:42:15.7664236Z 
2019-08-28T17:42:15.7664272Z 
2019-08-28T17:42:15.7674569Z failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
2019-08-28T17:42:15.7674757Z Build completed unsuccessfully in 0:03:23
2019-08-28T17:42:15.7674757Z Build completed unsuccessfully in 0:03:23
2019-08-28T17:42:15.7728504Z Makefile:48: recipe for target 'check' failed
2019-08-28T17:42:15.7728648Z 
2019-08-28T17:42:15.7728726Z command did not execute successfully: "make" "check"
2019-08-28T17:42:15.7728822Z expected success, got: exit code: 2
2019-08-28T17:42:15.7728868Z 
2019-08-28T17:42:15.7728868Z 
2019-08-28T17:42:15.7728905Z 
2019-08-28T17:42:15.7729005Z make: *** [check] Error 1
2019-08-28T17:42:15.7779619Z Build completed unsuccessfully in 0:10:30
2019-08-28T17:42:15.7784932Z == clock drift check ==
2019-08-28T17:42:15.7810885Z   local time: Wed Aug 28 17:42:15 UTC 2019
2019-08-28T17:42:15.8541012Z   network time: Wed, 28 Aug 2019 17:42:15 GMT
2019-08-28T17:42:15.8541012Z   network time: Wed, 28 Aug 2019 17:42:15 GMT
2019-08-28T17:42:15.8544290Z == end clock drift check ==
2019-08-28T17:42:17.7103026Z ##[error]Bash exited with code '1'.
2019-08-28T17:42:17.7145258Z ##[section]Starting: Upload CPU usage statistics
2019-08-28T17:42:17.7152383Z ==============================================================================
2019-08-28T17:42:17.7152484Z Task         : Bash
2019-08-28T17:42:17.7152578Z Description  : Run a Bash script on macOS, Linux, or Windows

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 28, 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 28, 2019
@mati865 mati865 mentioned this pull request Sep 6, 2019
Merged
@newpavlov newpavlov mentioned this pull request Sep 6, 2019
Merged
@mati865
Copy link
Contributor Author

mati865 commented Sep 6, 2019

Ready to go.

@rustbot modify labels: -S-blocked +S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Sep 6, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 6, 2019

📌 Commit 32101ad has been approved by alexcrichton

@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 Sep 6, 2019
@newpavlov newpavlov mentioned this pull request Sep 6, 2019
Closed
@bors
Copy link
Contributor

bors commented Sep 7, 2019

⌛ Testing commit 32101ad with merge 2b58d1cff23a1ead45c0f0180996e26c3c2da14d...

@bors
Copy link
Contributor

bors commented Sep 7, 2019

💥 Test timed out

@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 Sep 7, 2019
@mati865
Copy link
Contributor Author

mati865 commented Sep 9, 2019

Kindly asking the the retry (msvc was too slow again...).

@alexcrichton
Copy link
Member

@bors: retry

@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 Sep 9, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 9, 2019
@Centril
Rollup merge of rust-lang#63806 - mati865:rand, r=alexcrichton
611458b 
Upgrade rand to 0.7

Also upgrades `getrandom` to avoid bug encountered by rust-lang#61393 which bumps libc to `0.2.62`.
@Centril Centril mentioned this pull request Sep 9, 2019
Merged
bors added a commit that referenced this pull request Sep 9, 2019
@bors
Auto merge of #64321 - Centril:rollup-jsj5tpl, r=Centril
f06fe4d 
Rollup of 5 pull requests

Successful merges:

 - #63806 (Upgrade rand to 0.7)
 - #64054 (Always emit unresolved import errors and hide unused import lint)
 - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583)
 - #64317 (Update LLVM submodule)
 - #64320 (Update version of `rustc-std-workspace-*` crates)

Failed merges:

r? @ghost
bors added a commit that referenced this pull request Sep 10, 2019
@bors
Auto merge of #64321 - Centril:rollup-jsj5tpl, r=Centril
122fefc 
Rollup of 5 pull requests

Successful merges:

 - #63806 (Upgrade rand to 0.7)
 - #64054 (Always emit unresolved import errors and hide unused import lint)
 - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583)
 - #64317 (Update LLVM submodule)
 - #64320 (Update version of `rustc-std-workspace-*` crates)

Failed merges:

r? @ghost
@bors bors merged commit 32101ad into rust-lang:master Sep 10, 2019
@mati865 mati865 deleted the rand branch September 10, 2019 06:52
@mati865 mati865 mentioned this pull request Sep 11, 2019
Merged
bors added a commit to rust-lang/libc that referenced this pull request Sep 11, 2019
@bors
Auto merge of #1507 - mati865:patch-2, r=gnzlbg
8f72a8d 
Test FreeBSD 12 on latest nightly

~~Let's see if [libc update](rust-lang/rust#63806) for Rust fixed it.~~

Fixes #1489
bors added a commit to rust-lang/libc that referenced this pull request Sep 13, 2019
@bors
Auto merge of #1507 - mati865:patch-2, r=gnzlbg
b156fb3 
Test FreeBSD 12 on latest nightly

~~Let's see if [libc update](rust-lang/rust#63806) for Rust fixed it.~~

Fixes #1489
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@newpavlov newpavlov newpavlov left review comments

@RalfJung RalfJung RalfJung left review comments

@gnzlbg gnzlbg gnzlbg approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@mati865 @rust-highfive @RalfJung @gnzlbg @alexcrichton @bors @newpavlov @nikomatsakis @Kixiron @rustbot