Update cargo, rls, books

[ehuss]

cargo

10 commits in 5c6aa46e6f28661270979696e7b4c2f0dff8628f..95b45eca19ac785263fed98ecefe540bb47337ac
2019-02-22 19:32:35 +0000 to 2019-03-06 19:24:30 +0000

• Relax some rustdoc tests. (Relax some rustdoc tests. cargo#6721)
• Include build script execution in the fingerprint. (Include build script execution in the fingerprint. cargo#6720)
• part of the infrastructure for public & private dependencies in the resolver (part of the infrastructure for public & private dependencies in the resolver cargo#6653)
• Bump to 0.36.0 (Bump to 0.36.0 cargo#6718)
• Some test/bench-related tweaks (Some test/bench-related tweaks cargo#6707)
• Fix links to the permanent home of the edition guide. (Fix links to the permanent home of the edition guide. cargo#6703)
• HTTPS all the things (HTTPS all the things cargo#6614)
• Cargo test quicker by not building untested examples when filtered (Cargo test quicker by not building untested examples when filtered cargo#6683)
• Link from ARCHITECTURE.md to docs.rs and github (Link from ARCHITECTURE.md to docs.rs and github cargo#6695)
• Update how to install rustfmt (Update how to install rustfmt cargo#6696)

rls

9 commits in 0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e..6a1b5a9cfda2ae19372e0613e76ebefba36edcf5
2019-02-14 07:52:15 +0000 to 2019-03-04 20:24:45 +0000

• Update cargo and clippy. (Update cargo and clippy. rls#1388)
• catch up rust-lang/rust PR#58321 (catch up rust-lang/rust PR#58321 rls#1384)
• Apply Clippy fixes (Apply Clippy fixes rls#1327)
• Various cosmetic improvements (Various cosmetic improvements rls#1326)
• Make test RlsHandle transport-agnostic (Make test RlsHandle transport-agnostic rls#1317)
• Translate remaining tests (Translate remaining tests rls#1320)
• Remove unnecessary #![feature]s (Remove unnecessary #![feature]s rls#1323)
• Update Clippy (Update Clippy rls#1319)
• Update Clippy (Update Clippy rls#1315)

cc @Xanewok

Books

See #58936 for details.

[rust-highfive]

r? @nikomatsakis

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

r? @alexcrichton

[alexcrichton]

@bors: r+ p=1

[bors]

📌 Commit 57bd9e0 has been approved by alexcrichton

[bors]

⌛ Testing commit 57bd9e0 with merge 80bf632...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

The job i686-gnu 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.

[02:56:42] [RUSTC-TIMING] parking_lot_core test:false 3.200
[02:56:42]    Compiling parking_lot v0.7.1
[02:56:44] [RUSTC-TIMING] parking_lot test:false 1.758
[02:56:44]    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
The job exceeded the maximum time limit for jobs, and has been terminated.

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)

[Xanewok]

i686-gnu{,-nopt} timed out at 3hrs

@bors retry

[bors]

⌛ Testing commit 57bd9e0 with merge 67b4835eb35511378daca0376fbe4dfb3c86e966...

[bors]

💔 Test failed - status-appveyor

[alexcrichton]

@bors: retry

#58160

[bors]

⌛ Testing commit 57bd9e0 with merge 49a263cd7b787d4e02be334921dc32006236f237...

[ehuss]

cc @Zoxc this includes the fix to unblock #56732

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-cargo-rls (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-cargo-rls --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[ehuss]

@bors r+

[bors]

📌 Commit 9243f9c has been approved by ehuss

[ehuss]

@bors r+

[bors]

📌 Commit 0609029 has been approved by ehuss

[bors]

⌛ Testing commit 0609029 with merge 5c14458f967c539c3edd0e2d9d71dbfde088834a...

[bors]

💔 Test failed - checks-travis

[rust-highfive]

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.

==> Pouring swig-3.0.12.high_sierra.bottle.tar.gz
🍺  /usr/local/Cellar/swig/3.0.12: 755 files, 5.5MB
curl: (35) LibreSSL SSL_connect: SSL_ERROR_SYSCALL in connection to s3-us-west-1.amazonaws.com:443 
The command "curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin" failed. Retrying, 2 of 3.
curl: (56) Recv failure: Operation timed out
The command "curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz" failed. Retrying, 2 of 3.
clang+llvm-7.0.0-x86_64-apple-darwin/bin/dsymutil: Lzma library error: Corrupted input data
tar: Error exit delayed from previous errors.
travis_time:end:0d88647e:start=1552086787178576000,finish=1552087360639126000,duration=573460550000
The command "case "$TRAVIS_OS_NAME" in linux) travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl && chmod +x $HOME/stamp && export PATH=$PATH:$HOME ;; osx) if [[ "$RUST_CHECK_TARGET" == dist ]]; then travis_retry brew update && travis_retry brew install xz && travis_retry brew install swig; fi && travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin && chmod +x /usr/local/bin/sccache && travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin && chmod +x /usr/local/bin/stamp && travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - && export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang && export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ && export AR=ar ;; esac" failed and exited with 1 during .
Your build has been stopped.

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]

@bors retry
network timeouts

[bors]

⌛ Testing commit 0609029 with merge 777cc25...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing 777cc25 to master...