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

Update Cargo.lock #61393

Merged
merged 8 commits into from
Aug 2, 2019
Merged

Update Cargo.lock #61393

merged 8 commits into from
Aug 2, 2019

Conversation

gnzlbg
Copy link
Contributor

@gnzlbg gnzlbg commented May 31, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 May 31, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.
travis_time:end:2b01e8fc:start=1559299511752065945,finish=1559299512687414178,duration=935348233
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:03:27]   Downloaded curl-sys v0.4.18
[00:03:27]   Downloaded memchr v2.2.0
[00:03:27]   Downloaded rand_os v0.1.3
[00:03:27]   Downloaded glob v0.3.0
[00:03:27]   Downloaded rgb v0.8.13
[00:03:27]   Downloaded num-traits v0.1.43
[00:03:27]   Downloaded env_logger v0.6.1
[00:03:27]   Downloaded error-chain v0.12.1
[00:03:27]   Downloaded datafrog v2.0.1
---
[00:04:47] * rdrand 
[00:04:47] some tidy checks failed
[00:04:47] 
[00:04:47] 
[00:04:47] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:47] 
[00:04:47] 
[00:04:47] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:47] Build completed unsuccessfully in 0:01:17
---
travis_time:end:01b570f6:start=1559299811869586621,finish=1559299811874630983,duration=5044362
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2b263885
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:027ab59d
travis_time:start:027ab59d
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:06a0ae11
$ dmesg | grep -i kill

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)

@tesuji
Copy link
Contributor

tesuji commented May 31, 2019

You may want to update libc only by cargo +nightly update -p libc.

@bors
Copy link
Contributor

bors commented May 31, 2019

☔ The latest upstream changes (presumably #57967) made this pull request unmergeable. Please resolve the merge conflicts.

@gnzlbg gnzlbg force-pushed the update_libc branch 4 times, most recently from e62b4b3 to f705c38 Compare June 1, 2019 11:21
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.
travis_time:end:05295aec:start=1559388157038476135,finish=1559388157793581933,duration=755105798
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:26:29]    Compiling rustc-demangle v0.1.15
[00:26:33]    Compiling memmap v0.6.2
[00:26:34]    Compiling num_cpus v1.8.0
[00:26:38]    Compiling rustc_llvm v0.0.0 (/checkout/src/librustc_llvm)
[00:26:42] error: use of deprecated item 'libc::uint32_t': Use u32 instead.
[00:26:42]    --> src/librustc_codegen_llvm/llvm/ffi.rs:569:29
[00:26:42] 569 |         pub struct DIFlags: ::libc::uint32_t {
[00:26:42]     |                             ^^^^^^^^^^^^^^^^
[00:26:42]     |
[00:26:42]     = note: `-D deprecated` implied by `-D warnings`
[00:26:42]     = note: `-D deprecated` implied by `-D warnings`
[00:26:42] 
[00:26:42] error: use of deprecated item 'libc::uint32_t': Use u32 instead.
[00:26:42]    --> src/librustc_codegen_llvm/llvm/ffi.rs:598:31
[00:26:42]     |
[00:26:42] 598 |         pub struct DISPFlags: ::libc::uint32_t {
[00:26:42] 
[00:26:42] 
[00:26:42] error: use of deprecated item 'libc::uint32_t': Use u32 instead.
[00:26:42]    --> src/librustc_codegen_llvm/llvm/ffi.rs:569:29
[00:26:42] 569 |         pub struct DIFlags: ::libc::uint32_t {
[00:26:42]     |                             ^^^^^^^^^^^^^^^^
[00:26:42] 
[00:26:44] error: aborting due to 3 previous errors
---
19256 ./src/llvm-project/lldb/www/cpp_reference/html
18956 ./obj/build/x86_64-unknown-linux-gnu/stage0-std/release/build
17940 ./src/llvm-project/lldb/www/python_reference
travis_time:end:0702be1a:start=1559389773435770534,finish=1559389774041021194b8b
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:06ef8afe
$ dmesg | grep -i kill

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)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.
travis_time:end:0a0d20f8:start=1559391771090533947,finish=1559391771857680938,duration=767146991
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:02:27] .................................................................................................... 1100/2923
[01:02:36] .................................................................................................... 1200/2923
[01:02:47] .................................................................................................... 1300/2923
[01:02:59] ....................ii.............................................................................. 1400/2923
[01:03:11] .......................................................F............................................ 1500/2923
[01:03:34] .................................................................................................... 1700/2923
[01:03:48] .................................................................................................... 1800/2923
[01:03:58] .................................................................................................... 1900/2923
[01:04:13] ..i.......................................................................i......................... 2000/2923
---
[01:06:53] failures:
[01:06:53] 
[01:06:53] ---- [run-pass] run-pass/issues/issue-3656.rs stdout ----
[01:06:53] normalized stderr:
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53]    |
[01:06:53] LL | use libc::{c_uint, uint32_t, c_void};
[01:06:53]    |
[01:06:53]    = note: #[warn(deprecated)] on by default
[01:06:53] 
[01:06:53] 
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53] LL |     count: uint32_t,
[01:06:53]    |            ^^^^^^^^
[01:06:53] 
[01:06:53] 
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53]    |
[01:06:53] LL |     salt_size: uint32_t,
[01:06:53] 
[01:06:53] 
[01:06:53] 
[01:06:53] 
[01:06:53] 
[01:06:53] The actual stderr differed from the expected stderr.
[01:06:53] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issues/issue-3656/issue-3656.stderr
[01:06:53] To update references, rerun the tests and pass the `--bless` flag
[01:06:53] To only update this specific test, also pass `--test-args issues/issue-3656.rs`
[01:06:53] error: 1 errors occurred comparing output.
[01:06:53] status: exit code: 0
[01:06:53] status: exit code: 0
[01:06:53] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass/issues/issue-3656.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issues/issue-3656/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/issues/issue-3656/auxiliary"
[01:06:53] ------------------------------------------
[01:06:53] 
[01:06:53] ------------------------------------------
[01:06:53] stderr:
[01:06:53] stderr:
[01:06:53] ------------------------------------------
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53]    |
[01:06:53] LL | use libc::{c_uint, uint32_t, c_void};
[01:06:53]    |
[01:06:53]    = note: #[warn(deprecated)] on by default
[01:06:53] 
[01:06:53] 
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53] LL |     count: uint32_t,
[01:06:53]    |            ^^^^^^^^
[01:06:53] 
[01:06:53] 
[01:06:53] warning: use of deprecated item 'libc::uint32_t': Use u32 instead.
[01:06:53]    |
[01:06:53]    |
[01:06:53] LL |     salt_size: uint32_t,
[01:06:53] 
[01:06:53] 
[01:06:53] ------------------------------------------
[01:06:53] 
---
[01:06:53] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[01:06:53] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:06:53] 
[01:06:53] 
[01:06:53] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:06:53] 
[01:06:53] 
[01:06:53] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:06:53] Build completed unsuccessfully in 1:02:02

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 Jun 1, 2019

☔ The latest upstream changes (presumably #61388) made this pull request unmergeable. Please resolve the merge conflicts.

@gnzlbg gnzlbg force-pushed the update_libc branch 2 times, most recently from eadd725 to 7320770 Compare June 2, 2019 13:16
@bors
Copy link
Contributor

bors commented Jun 7, 2019

☔ The latest upstream changes (presumably #61408) made this pull request unmergeable. Please resolve the merge conflicts.

@jackpot51
Copy link
Contributor

What is the status of this change?

@mati865
Copy link
Contributor

mati865 commented Jun 17, 2019

@gnzlbg this PR needs rebasing, do you have time to do it?

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Jun 21, 2019

I can rebase it, but I don't think doing that makes much sense until it's approved. The Cargo.lock becomes unmergeable every other commit.

@gnzlbg gnzlbg force-pushed the update_libc branch 2 times, most recently from 7c8879d to e5fe002 Compare June 21, 2019 15:18
@gnzlbg
Copy link
Contributor Author

gnzlbg commented Jun 21, 2019

@mati865 i've rebased it, but maybe somebody else wants to pick this PR up until it gets merged ?

src/libstd/lib.rs Outdated Show resolved Hide resolved
@alexcrichton
Copy link
Member

I would personally be fine landing this at any time so r=me, it's just likely going to be tricky navigating bugs in dependencies.

@mati865
Copy link
Contributor

mati865 commented Jun 21, 2019

Sorry, I wrongly thought it's reviewed and just waits for merging.


I think you will have to add mach to https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/deps.rs#L26

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Jun 21, 2019

I think you will have to add mach to

@mati865 what license should mach have ?

@mati865
Copy link
Contributor

mati865 commented Jun 21, 2019

EDIT: Actually on second thought it would fit better here:

const WHITELIST: &[Crate<'_>] = &[

I'm not the right person to ask.


@gnzlbg it's listed as BSD-2-Clause so IMO it's a non blocker, there is another BSD-2-Clause crate listed in exceptions:

"arrayref", // BSD-2-Clause, mdbook via handlebars via pest

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Jun 21, 2019

@mati865 would this be enough: fitzgen/mach#54

@mati865
Copy link
Contributor

mati865 commented Jun 21, 2019

@gnzlbg I'm not a lawyer so I cannot tell if that relicensing would be OK (usually you need confirmation from all contributors).
I don't know Rust licensing well enough to comment on this, probably someone from Core team would know.

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 1, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 1, 2019

📌 Commit 52caca0 has been approved by gnzlbg

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2019
@bors
Copy link
Contributor

bors commented Aug 1, 2019

⌛ Testing commit 52caca0 with merge 86f7797cc4c0f575be1dfe0a80969808dd614cdd...

@bors
Copy link
Contributor

bors commented Aug 1, 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 1, 2019
@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 2, 2019

Let's retry this once: @bors: r+

@bors
Copy link
Contributor

bors commented Aug 2, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Aug 2, 2019

📌 Commit 52caca0 has been approved by gnzlbg

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

bors commented Aug 2, 2019

⌛ Testing commit 52caca0 with merge fc3ef96...

bors added a commit that referenced this pull request Aug 2, 2019
@bors
Copy link
Contributor

bors commented Aug 2, 2019

☀️ Test successful - checks-azure
Approved by: gnzlbg
Pushing fc3ef96 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2019
@bors bors merged commit 52caca0 into rust-lang:master Aug 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
Upgrade rand to 0.7

Also upgrades `getrandom` to avoid bug encountered by rust-lang#61393 which bumps libc to `0.2.62`.
`wasi` crate was going to be added by rust-lang#63676 anyway.
Centril added a commit to Centril/rust that referenced this pull request Sep 9, 2019
Upgrade rand to 0.7

Also upgrades `getrandom` to avoid bug encountered by rust-lang#61393 which bumps libc to `0.2.62`.
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. 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.