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 #59997

Merged
merged 1 commit into from
Apr 17, 2019
Merged

Update cargo #59997

merged 1 commit into from
Apr 17, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 15, 2019

16 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..b6581d383ed596b133e330011658c6f83cf85c2f
2019-04-04 14:11:33 +0000 to 2019-04-16 16:02:11 +0000

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Apr 15, 2019

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 15, 2019

📌 Commit 4eb3ac3 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 Apr 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 15, 2019
Update cargo

12 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..ef0223f12597b5e0d9d2feed1b92c41306b1fc05
2019-04-04 14:11:33 +0000 to 2019-04-15 14:36:55 +0000
- Fix test include_overrides_gitignore. (rust-lang/cargo#6850)
- Clarify optional registry key behaviour (rust-lang/cargo#6851)
- Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842)
- Better error if PathSource::walk can't access something. (rust-lang/cargo#6841)
- Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839)
- Improve error message for `publish` key restriction. (rust-lang/cargo#6838)
- Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832)
- testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837)
- Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824)
- Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829)
- Add install-upgrade. (rust-lang/cargo#6798)
- Clarify docs of install without <crate> (rust-lang/cargo#6823)
@Centril
Copy link
Contributor

Centril commented Apr 15, 2019

@bors p=2

r0llup planning.

Centril added a commit to Centril/rust that referenced this pull request Apr 16, 2019
Update cargo

12 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..ef0223f12597b5e0d9d2feed1b92c41306b1fc05
2019-04-04 14:11:33 +0000 to 2019-04-15 14:36:55 +0000
- Fix test include_overrides_gitignore. (rust-lang/cargo#6850)
- Clarify optional registry key behaviour (rust-lang/cargo#6851)
- Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842)
- Better error if PathSource::walk can't access something. (rust-lang/cargo#6841)
- Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839)
- Improve error message for `publish` key restriction. (rust-lang/cargo#6838)
- Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832)
- testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837)
- Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824)
- Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829)
- Add install-upgrade. (rust-lang/cargo#6798)
- Clarify docs of install without <crate> (rust-lang/cargo#6823)
@bors
Copy link
Contributor

bors commented Apr 16, 2019

⌛ Testing commit 4eb3ac3 with merge 4ad77449175ac5e27ef331fb2f9fcde39bf8e040...

@bors
Copy link
Contributor

bors commented Apr 16, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-aux 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.
[01:47:38] test build_script::adding_an_override_invalidates ... ok
[01:47:38] test build_script::assume_build_script_when_build_rs_present ... ok
[01:47:38] test build_script::build_deps_not_for_normal ... ok
[01:47:38] test build_script::build_script_only ... ok
[01:47:38] test build_script::build_script_scan_eacces ... ok
[01:47:39] test build_script::build_deps_simple ... ok
[01:47:39] test build_script::build_script_with_lto ... ok
[01:47:40] test build_script::cfg_env_vars_available ... ok
[01:47:40] test build_script::cfg_feedback ... ok
---
[01:49:40] test install::uninstall_cwd ... ok
[01:49:40] test install::uninstall_piecemeal ... ok
[01:49:40] test install::uninstall_multiple_and_some_pkg_does_not_exist ... ok
[01:49:41] test install::vers_precise ... ok
[01:49:41] test install_upgrade::ambiguous_version_no_longer_allowed ... ok
[01:49:41] test install::workspace_uses_workspace_target_dir ... ok
[01:49:41] test install::version_too ... ok
[01:49:41] test install::version_too ... ok
[01:49:41] test install_upgrade::change_target_rebuilds ... ok
[01:49:42] test install_upgrade::fails_for_conflicts_known ... ok
[01:49:42] test install_upgrade::fails_for_conflicts_unknown ... ok
[01:49:42] test install_upgrade::change_profile_rebuilds ... ok
[01:49:43] test install_upgrade::change_bin_sets_rebuilds ... ok
[01:49:43] test install_upgrade::change_features_rebuilds ... ok
[01:49:43] test install_upgrade::no_track_gated ... ok
[01:49:43] test install_upgrade::no_track ... ok
[01:49:43] test install_upgrade::forwards_compatible ... ok
[01:49:44] test install_upgrade::path_is_always_dirty ... ok
[01:49:46] test install_upgrade::supports_multiple_binary_names ... ok
[01:49:46] test install_upgrade::uninstall ... ok
[01:49:46] test install_upgrade::registry_upgrade ... ok
[01:49:47] test install_upgrade::switch_sources ... ok
[01:49:47] test install_upgrade::multiple_report ... ok
[01:49:48] test install_upgrade::upgrade_force ... ok
[01:49:48] test install_upgrade::v1_already_installed_fresh ... ok
[01:49:48] test install_upgrade::upgrade_git ... ok
[01:49:48] test jobserver::jobserver_and_j ... ok
[01:49:48] test install_upgrade::v1_already_installed_dirty ... ok
[01:49:49] test list_targets::build_list_targets ... ok
[01:49:49] test list_targets::check_list_targets ... ok
[01:49:49] test list_targets::doc_list_targets ... ok
[01:49:49] test jobserver::jobserver_exists ... ok
---
[01:49:52] test local_registry::path_dep_rewritten ... ok
[01:49:52] test lockfile_compat::current_lockfile_format ... ok
[01:49:52] test lockfile_compat::listed_checksum_bad_if_we_cannot_compute ... ok
[01:49:52] test lockfile_compat::locked_correct_error ... ok
[01:49:52] test install_upgrade::v2_syncs ... ok
[01:49:52] test local_registry::simple ... ok
[01:49:52] test lockfile_compat::unlisted_checksum_is_bad_if_we_calculate ... ok
[01:49:52] test lockfile_compat::wrong_checksum_is_an_error ... ok
[01:49:52] test login::login_with_new_credentials ... ok
---
[01:51:52] test workspaces::ws_warn_unused ... ok
[01:51:52] 
[01:51:52] failures:
[01:51:52] 
[01:51:52] ---- workspaces::new_warning_with_corrupt_ws stdout ----
[01:51:52] running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo new bar`
[01:51:52] thread 'workspaces::new_warning_with_corrupt_ws' panicked at '
[01:51:52]     but: exited with exit code: 101
[01:51:52] --- stdout
[01:51:52] 
[01:51:52] --- stderr
[01:51:52] --- stderr
[01:51:52] error: Failed to create package `bar` at `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1467/foo/bar`
[01:51:52] Caused by:
[01:51:52] Caused by:
[01:51:52]   could not determine the current user, please set $USER
[01:51:52] 
[01:51:52] 
[01:51:52] failures:
[01:51:52]     workspaces::new_warning_with_corrupt_ws
---
[01:51:52] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static"
[01:51:52] expected success, got: exit code: 101
[01:51:52] 
[01:51:52] 
[01:51:52] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:51:52] Build completed unsuccessfully in 0:31:24
[01:51:52] Makefile:50: recipe for target 'check-aux' failed
[01:51:52] make: *** [check-aux] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0f527088
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Apr 16 10:16:51 UTC 2019
---
travis_time:end:04156d88:start=1555409814747787247,finish=1555409814754448793,duration=6661546
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1d0e2a5e
$ 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:start:crashlog
obj/cores/core.8919.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 8924]
[New LWP 8919]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007f04bc7ae428 in ?? ()
[Current thread is 1 (LWP 8924)]
#0  0x00007f04bc7ae428 in ?? ()
#1  0x00007f04bc7b002a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:1d0e2a5e:start=1555409814759952918,finish=1555409816714895817,duration=1954942899
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:09c951d8
travis_time:start:09c951d8
$ 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:1226f59f
$ 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)

@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 Apr 16, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Apr 16, 2019

Updated!

@alexcrichton
Copy link
Member

@bors: r+ delegate+

@bors
Copy link
Contributor

bors commented Apr 16, 2019

✌️ @ehuss can now approve this pull request

@bors
Copy link
Contributor

bors commented Apr 16, 2019

📌 Commit f3b2e27a0610e2b6519973b084b0dfde1f32e1e3 has been approved by alexcrichton

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 16, 2019
@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 Apr 16, 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:0d8963d8:start=1555436632363393173,finish=1555436914175675560,duration=281812282387
$ 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:01:48] extracting /checkout/obj/build/cache/2019-03-20/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:49] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:01:49] 
[00:01:49] Caused by:
[00:01:49]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:49] Build completed unsuccessfully in 0:00:34
[00:01:49] make: *** [prepare] Error 1
[00:01:49] Makefile:69: recipe for target 'prepare' failed
[00:01:50] Command failed. Attempt 2/5:
[00:01:50] Command failed. Attempt 2/5:
[00:01:50] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:01:50] 
[00:01:50] Caused by:
[00:01:50]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:50] Build completed unsuccessfully in 0:00:00
[00:01:50] Makefile:69: recipe for target 'prepare' failed
[00:01:50] make: *** [prepare] Error 1
[00:01:52] Command failed. Attempt 3/5:
[00:01:52] Command failed. Attempt 3/5:
[00:01:52] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:01:52] 
[00:01:52] Caused by:
[00:01:52]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:52] Build completed unsuccessfully in 0:00:00
[00:01:52] Makefile:69: recipe for target 'prepare' failed
[00:01:52] make: *** [prepare] Error 1
[00:01:55] Command failed. Attempt 4/5:
[00:01:55] Command failed. Attempt 4/5:
[00:01:55] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:01:55] 
[00:01:55] Caused by:
[00:01:55]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:55] Build completed unsuccessfully in 0:00:00
[00:01:55] make: *** [prepare] Error 1
[00:01:55] Makefile:69: recipe for target 'prepare' failed
[00:01:59] Command failed. Attempt 5/5:
[00:01:59] Command failed. Attempt 5/5:
[00:01:59] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:01:59] 
[00:01:59] Caused by:
[00:01:59]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:01:59] Build completed unsuccessfully in 0:00:00
[00:01:59] make: *** [prepare] Error 1
[00:01:59] Makefile:69: recipe for target 'prepare' failed
[00:01:59] The command has failed after 5 attempts.
---
travis_time:end:0736773c:start=1555437048102739529,finish=1555437048107644236,duration=4904707
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01747384
$ 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:00477570
travis_time:start:00477570
$ 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:12337698
$ 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)

@ehuss
Copy link
Contributor Author

ehuss commented Apr 16, 2019

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Apr 16, 2019

📌 Commit df7445b has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Apr 16, 2019

⌛ Testing commit df7445b with merge c132c96...

bors added a commit that referenced this pull request Apr 16, 2019
Update cargo

16 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..b6581d383ed596b133e330011658c6f83cf85c2f
2019-04-04 14:11:33 +0000 to 2019-04-16 16:02:11 +0000
- Fix new_warning_with_corrupt_ws missing "USER". (rust-lang/cargo#6857)
- Ignore Clippy redundant_closure (rust-lang/cargo#6855)
- Pass OsStr/OsString args through to the process spawned by cargo run. (rust-lang/cargo#6849)
- Bump to 0.37.0 (rust-lang/cargo#6852)
- Fix test include_overrides_gitignore. (rust-lang/cargo#6850)
- Clarify optional registry key behaviour (rust-lang/cargo#6851)
- Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842)
- Better error if PathSource::walk can't access something. (rust-lang/cargo#6841)
- Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839)
- Improve error message for `publish` key restriction. (rust-lang/cargo#6838)
- Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832)
- testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837)
- Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824)
- Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829)
- Add install-upgrade. (rust-lang/cargo#6798)
- Clarify docs of install without <crate> (rust-lang/cargo#6823)
@fortanix-bot
Copy link

Build failed for target x86_64-fortanix-unknown-sgx - status

cc @jethrogb

@jethrogb
Copy link
Contributor

SGX test failure looks spurious... interesting

@bors
Copy link
Contributor

bors commented Apr 17, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing c132c96 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2019
@bors bors merged commit df7445b into rust-lang:master Apr 17, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #59997!

Tested on commit c132c96.
Direct link to PR: #59997

🎉 rls on windows: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 17, 2019
Tested on commit rust-lang/rust@c132c96.
Direct link to PR: <rust-lang/rust#59997>

🎉 rls on windows: test-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
bors added a commit that referenced this pull request Apr 17, 2019
SGX target: change re-entry abort logic

Even though re-entry after exit is generally not acceptable, there is a race condition where the enclave thinks it's exited but userspace doesn't know that yet. An entry during that time will currently result in an enclave panic (see #59997 (comment), #60003 (comment)). Instead of panicking, just do a regular exit on re-entry.

cc @jseyfried
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.

8 participants