Update Cargo and RLS

[ehuss]

cargo

32 commits in 0ec7281b9c36ca7f724bfac8b029633910270a48..2fb77a49b43bf7266793c07a19a06749e6a8ad5a
2018-08-20 21:18:45 +0000 to 2018-09-07 17:00:19 +0000

• clippy: resolve all warnings about useless format!() (clippy: resolve all warnings about useless format!() cargo#5966)
• make cargo install ignore .cargo/config (make cargo install ignore .cargo/config cargo#5874)
• Force cargo fix to rebuild (Force cargo fix to rebuild cargo#5944)
• Fix path::deep_dependencies_trigger_rebuild often failing in CI (Fix path::deep_dependencies_trigger_rebuild often failing in CI cargo#5952)
• Introduce the CWD macro in test output asserting (Introduce the CWD macro in test output asserting cargo#5950)
• Extract FixArgs::prepare_for_edition_resolve (Extract FixArgs::prepare_for_edition_resolve cargo#5949)
• Add --allow-staged to cargo fix (Add --allow-staged to cargo fix cargo#5943)
• Remove Cargo's internal hamcrest module (Remove Cargo's internal hamcrest module cargo#5945)
• Further reduce assert_that usage (Further reduce assert_that usage cargo#5942)
• Replace lots of hamcrest's assert_that with a builder style (Replace lots of hamcrest's assert_that with a builder style cargo#5929)
• Add documentation for creating test dependencies. (Add documentation for creating test dependencies. cargo#5939)
• Only use non-absolute paths for path dependencies (Only use non-absolute paths for path dependencies cargo#5935)
• Metabuild (RFC 2196) (Metabuild (RFC 2196) cargo#5628)
• Fix test failure on nightly due to codemap::Span change. (Fix test failure on nightly due to codemap::Span change. cargo#5937)
• Make "cargo uninstall" uninstall the cwd bins (Make "cargo uninstall" uninstall the cwd bins cargo#5927)
• fix cargo not doing anything when the input and output mtimes are equal (fix cargo not doing anything when the input and output mtimes are equal cargo#5919)
• List URL in HTTP download failures (List URL in HTTP download failures cargo#5926)
• Improve the cargo install deprecation messaging (Improve the cargo install deprecation messaging cargo#5925)
• Add required-features to SerializedTarget (Add required-features to SerializedTarget cargo#5902)
• Add a configuration option to fetch with git-the-CLI (Add a configuration option to fetch with git-the-CLI cargo#5914)

Added:

• Add a way to skip the use_the_cli test for rust repo. (Add a way to skip the use_the_cli test for rust repo. cargo#5976)
• Do not use a disabled-option in the docs (Do not use a disabled-option in the docs cargo#5973)
• Fix a doc link (Fix a doc link cargo#5970)
• Migrate some architecture notes from the wiki (Migrate some architecture notes from the wiki cargo#5971)
• Provide http-config option for curl low-speed-limit/time (Provide http-config option for curl low-speed-limit/time cargo#5957)

Added:

• Bump Cargo to 0.30.0 (Bump Cargo to 0.30.0 cargo#5991)
• Change the default edition for cargo new to 2018 (Change the default edition for cargo new to 2018 cargo#5989)
• Stabilize edition key and add cargo new --edition (Stabilize edition key and add cargo new --edition cargo#5984)
• Remove/rework some redundant .cwd(p.root()) in tests (Remove/rework some redundant .cwd(p.root()) in tests cargo#5987)
• Don't use an empty RUSTC_WRAPPER (Don't use an empty RUSTC_WRAPPER cargo#5985)
• fix: Fix unusual errors with RUSTC_WRAPPER (fix: Fix unusual errors with RUSTC_WRAPPER cargo#5983)
• Fix http.timeout documentation. (Fix http.timeout documentation. cargo#5977)

rls

6 commits in cf6358a00540a83dcc6e8c243f3306ccdbb9c354..ac2e802ae9115786196a498e22086d403efd95a4
2018-09-04 14:46:47 +0200 to 2018-09-08 00:17:42 +0200

• Update cargo. (Update cargo. rls#1048)
• Fix duplicated warning for rand::Rng::gen_ascii_chars (Fix duplicated warning for rand::Rng::gen_ascii_chars rls#1042)
• Avoid void-params deserialize errors (Avoid void-params deserialize errors rls#1041)
• Remove cached args/envs from old single crate mode (Remove cached args/envs from old single crate mode rls#1040)
• Include message in dispatch error log line (Include message in dispatch error log line rls#1039)
• Compile with newest rustc master (Compile with newest rustc master rls#1036)

[rust-highfive]

r? @alexcrichton

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[alexcrichton]

@bors: r+

[bors]

📌 Commit 25223cf8893fade36ade61e0c216532bc9aa6ac4 has been approved by alexcrichton

[bors]

⌛ Testing commit 25223cf8893fade36ade61e0c216532bc9aa6ac4 with merge 29e3e9b9f31112360e7db4a0d91ab7706142f1af...

[bors]

💔 Test failed - status-appveyor

[ehuss]

🤔 It passes locally for me, and I'm stumped as to how it could fail. @alexcrichton let me know if you have any ideas why it would fail, otherwise I can try investigating more.

[kennytm]

@ehuss Are you testing on Windows?

---- git::use_the_cli stdout ----
running `C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo.exe build -v`
thread 'git::use_the_cli' panicked at '
Expected: execs
    but: exited with exit code: 101
--- stdout
--- stderr
    Updating git repository `file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1`
     Running `git fetch --tags --quiet file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1 refs/heads/*:refs/heads/*`
fatal: '/C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
error: failed to load source for a dependency on `dep1`
Caused by:
  Unable to update file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1
Caused by:
  failed to clone into: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t654\home\.cargo\git\db\dep1-9eccd544448225e8
Caused by:
  process didn't exit successfully: `git fetch --tags --quiet file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1 refs/heads/*:refs/heads/*` (exit code: 128)
', tools\cargo\tests\testsuite\support\mod.rs:731:13
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
    git::use_the_cli
test result: FAILED. 1406 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out

[ehuss]

@kennytm yea, tested on windows and mac within the rust tree. The test has also been passing on Cargo's appveyor.

[alexcrichton]

git's error message is quite funny:

fatal: '/C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t654/dep1' does not appear to be a git repository

That /C:/... doesn't seem right and it seems like file:// URLs may not be as supported on windows git. This may be an issue with MSYS git vs "Windows git". I think that this repo has a different PATH management strategy than Cargo, which means that the default git.exe (probably the official installer) which supports file:// path is in place with Cargo but not in place here where MinGW git (which probably doesn't support this url scheme) is shadowing the other git.exe

I think it'd be fine to force Cargo to either whitelist this test to not run (like we do for cross-compilation tests) and then only run it on Cargo's CI.

[ehuss]

Ah, I can confirm the mingw /usr/bin/git does not like windows-style file urls.

Do you have a preferred way to detect this scenario? A new env var? Check for "windows" in git --version? Something else? I can prep a PR if you'd like.

[alexcrichton]

It's probably easiest to do what the cross-compilation tests do which is to execute the test unless a "weird env var" is set. The tests here in this repository would set such an environment variable, but in Cargo we'd continue to run the test by default.

I suppose a real fix is to add this to Cargo itself and figure out the best file:// path to give down to git, but it's fine to leave that as an open issue for now.

[ehuss]

Updated to skip the test (I think this one place should be sufficient, though I'm not certain). I could add an if cfg!(windows) if you'd like, but I'm not sure if it's necessary.

[alexcrichton]

@bors: r+

[bors]

📌 Commit f9f06c34a520e67aa1bcb28520f55859f5b37812 has been approved by alexcrichton

[ehuss]

@alexcrichton updated

[alexcrichton]

@bors: r+ p=1

[bors]

📌 Commit 0120e17 has been approved by alexcrichton

[bors]

⌛ Testing commit 0120e17 with merge da8b207de49fec3567ad7dce84c572c95646af04...

[bors]

💔 Test failed - status-travis

[rust-highfive]

The job x86_64-gnu-distcheck 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:45:32] test process::tests::test_add_to_env ... ok
[01:45:32] test process::tests::test_command_implements_send ... ok
[01:45:32] test process::tests::test_finish_once ... ok
[01:45:32] test process::tests::test_finish_twice ... ok
[01:45:32] thread '<unnamed>' panicked at 'output doesn't contain `RUN_TEST_NEW_ENV2=456`
[01:45:32] AR=ar
[01:45:32] AR_x86_64-unknown-linux-gnu=ar
[01:45:32] AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ
[01:45:32] AWS_SECRET_ACCESS_KEY=[secure]
[01:45:32] BOOTSTRAP_PARENT_ID=9692
[01:45:32] BOOTSTRAP_PYTHON=/usr/bin/python2.7
[01:45:32] BUILD_DIR=/checkout/obj/build/tmp/distcheck/build
[01:45:32] CARGO=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo
[01:45:32] CARGO_HOME=/cargo
[01:45:32] CARGO_MANIFEST_DIR=/checkout/obj/build/tmp/distcheck/src/libstd
[01:45:32] CARGO_MANIFEST_DIR=/checkout/obj/build/tmp/distcheck/src/libstd
[01:45:32] CARGO_PKG_AUTHORS=The Rust Project Developers
[01:45:32] CARGO_PKG_DESCRIPTION=The Rust Standard Library
[01:45:32] CARGO_PKG_HOMEPAGE=
[01:45:32] CARGO_PKG_NAME=std
[01:45:32] CARGO_PKG_VERSION=0.0.0
[01:45:32] CARGO_PKG_VERSION_MAJOR=0
[01:45:32] CARGO_PKG_VERSION_MINOR=0
[01:45:32] CARGO_PKG_VERSION_PATCH=0
[01:45:32] CARGO_PKG_VERSION_PRE=
[01:45:32] CARGO_TARGET_DIR=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1-std
[01:45:32] CC=sccache cc
[01:45:32] CC_x86_64-unknown-linux-gnu=sccache cc
[01:45:32] CFG_COMPILER_HOST_TRIPLE=x86_64-unknown-linux-gnu
[01:45:32] CFG_RELEASE_CHANNEL=dev
[01:45:32] CFLAGS=-ffunction-sections -fdata-sections -fPIC -m64
[01:45:32] CFLAGS_x86_64-unknown-linux-gnu=-ffunction-sections -fdata-sections -fPICINES=false
[01:45:32] RUSTC_DEBUG_ASSERTIONS=true
[01:45:32] RUSTC_DENY_WARNINGS=1
[01:45:32] RUSTC_ERROR_METADATA_DST=/checkout/obj/build/tmp/distcheck/build/tmp/extended-error-metadata
[01:45:32] RUSTC_FORCE_UNSTABLE=1
[01:45:32] RUSTC_LIBDIR=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1/lib
[01:45:32] RUSTC_METADATA_SUFFIX=rustc
[01:45:32] RUSTC_PRINT_STEP_TIMINGS=1
[01:45:32] RUSTC_REAL=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1/bin/rustc
[01:45:32] RUSTC_RPATH=true
[01:45:32] RUSTC_SNAPSHOT=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/rustc
[01:45:32] RUSTC_SNAPSHOT_LIBDIR=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/lib
[01:45:32] RUSTC_STAGE=1
[01:45:32] RUSTC_SYSROOT=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage1
[01:45:32] RUSTC_VERBOSE=0
[01:45:32] RUSTDOC=/checkout/obj/build/tmp/distcheck/build/bootstrap/debug/rustdoc
[01:45:32] RUSTDOC_CRATE_VERSION=1.30.0-dev
[01:45:32] RUSTDOC_REAL=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc
[01:45:32] RUSTDOC_REAL=/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc
[01:45:32] RUST_CONFIGURE_ARGS=--build=x86_64-unknown-linux-gnu --set rust.ignore-git=false --set build.print-step-timings --enable-verbose-tests --enable-sccache --disable-manage-submodules --enable-locked-deps --enable-cargo-openssl-static --enable-debug-assertions --enable-llvm-assertions
[01:45:32] RUST_RELEASE_CHANNEL=nightly
[01:45:32] SCCACHE_BUCKET=rust-lang-ci-sccache2
[01:45:32] SCCACHE_REGION=us-west-1
[01:45:32] SCRIPT=python2.7 ../x.py test distcheck
[01:45:32] SHLVL=2
[01:45:32] SHLVL=2
[01:45:32] SRC=/checkout/obj/build/tmp/distcheck
[01:45:32] SSL_CERT_DIR=/usr/lib/ssl/certs
[01:45:32] SSL_CERT_FILE=/usr/lib/ssl/certs/ca-certificates.crt
[01:45:32] TERM=xterm
[01:45:32] TEST_MIRI=false
[01:45:32] TRAVIS=true
[01:45:32] TRAVIS_BRANCH=auto
[01:45:32] TRAVIS_BRANCH=auto
[01:45:32] WINAPI_NO_BUNDLED_LIBRARIES=1
[01:45:32] _=/bin/sh
[01:45:32] __CARGO_DEFAULT_LIB_METADATA=dev
[01:45:32] ', libstd/process.rs:1828:13
[01:45:32] test process::tests::test_capture_env_at_spawn ... ok
[01:45:32] test process::tests::test_interior_nul_in_args_is_error ... ok
[01:45:32] test process::tests::test_interior_nul_in_arg_is_error ... ok
[01:45:32] test process::tests::test_interior_nul_in_current_dir_is_error ... ok
---
[01:45:42] 
[01:45:42] error: test failed, to rerun pass '--lib'
[01:45:42] 
[01:45:42] 
[01:45:42] command did not execute successfully: "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--frozen" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/obj/build/tmp/distcheck/src/libstd/Cargo.toml" "-p" "std" "--"
[01:45:42] 
[01:45:42] 
[01:45:42] failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
[01:45:42] Build completed unsuccessfully in 1:30:36
[01:45:42] Build completed unsuccessfully in 1:30:36
[01:45:43] make: *** [check] Error 1
[01:45:43] Makefile:58: recipe for target 'check' failed
[01:45:43] 
[01:45:43] 
[01:45:43] command did not execute successfully: "make" "check"
[01:45:43] 
[01:45:43] 
[01:45:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[01:45:43] Build completed unsuccessfully in 1:42:23
---
travis_time:end:0df1bfd7:start=1536394899256407954,finish=1536394899265364875,duration=8956921
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0ed4e417
$ 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 -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:0e051970
travis_time:start:0e051970
$ 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:0c5062c8
$ 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]

Looks like an unrelated error. test_inherit_env is checking the global environment while test_capture_env_at_spawn is mutating it. Perhaps a lock or something is in order?

[alexcrichton]

@bors: retry delegate+

[bors]

✌️ @ehuss can now approve this pull request

[bors]

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

[ehuss]

Merged in #54057.