Update RLS and Rustfmt

[nrc]

r? @alexcrichton

[alexcrichton]

@bors: r+

[bors]

📌 Commit 4bf1cc3 has been approved by alexcrichton

[nrc]

@bors: r- (I have a test fix to update this with)

[nrc]

@bors: r=alexcrichton

[bors]

📌 Commit 4b0e75e has been approved by alexcrichton

[nrc]

@bors: r- I'm going to tag on an extra fix

[kennytm]

@nrc#46145 has just been merged, is this one ready too?

[nrc]

@bors r=@alexcrichton, p=1 (need to get in before #44884 and fixes RLS, which is currently broken)

[bors]

📌 Commit f6bb14d has been approved by @alexcrichton,

[bors]

⌛ Testing commit f6bb14da589e7a19a913a87e9ddedf5ef2facb48 with merge f68ddb8cecb95aba88d7f05a2eb4d94f2c806805...

[bors]

💔 Test failed - status-appveyor

[bors]

💔 Test failed - status-travis

[kennytm]

Cargo test failed 🤔

[01:08:29] failures:
[01:08:29] [01:08:29] ---- frozen_flag_preserves_old_lockfile stdout ----
[01:08:29] running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build --locked`
[01:08:29] thread 'frozen_flag_preserves_old_lockfile' panicked at '
[01:08:29] Expected: execs
[01:08:29] but: exited with exit code: 101
[01:08:29] --- stdout
[01:08:29] [01:08:29] --- stderr
[01:08:29] Updating registry `file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1/registry`
[01:08:29] error: checksum for `foo v0.1.0` changed between lock files
[01:08:29] [01:08:29] this could be indicative of a few possible errors:
[01:08:29] [01:08:29] * the lock file is corrupt
[01:08:29] * a replacement source in use (e.g. a mirror) returned a different checksum
[01:08:29] * the source itself may be corrupt in one way or another
[01:08:29] [01:08:29] unable to verify that `foo v0.1.0` is the same as when the lockfile was generated
[01:08:29] [01:08:29] ', /cargo/registry/src/github.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31:12
[01:08:29] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:08:29] [01:08:29] [01:08:29] failures:
[01:08:29] frozen_flag_preserves_old_lockfile
[01:08:29] [01:08:29] test result: FAILED. 8 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:08:29] [01:08:29] �[m�[m�[31m�[1merror:�[m test failed, to rerun pass '--test lockfile-compat'
[01:08:29] [01:08:29] [01:08:29] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml"

[bors]

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

[nrc]

Rebased, updates Cargo to bring in the Cargo test fix, and re-enables RLS Rustfmt testing.

@bors: r=alexcrichton p=1

[bors]

📌 Commit 1cec22e has been approved by alexcrichton

[bors]

⌛ Testing commit 1cec22e with merge 0d3557abadbeced6b8931a1259c272029670a506...

[bors]

💔 Test failed - status-travis

[kennytm]

@bors retry — travis-ci/travis-ci#8821

[bors]

⌛ Testing commit 1cec22e with merge d6eddbedec89cfcfda2cb12870a730658176f6c7...

[bors]

💔 Test failed - status-appveyor

[nrc]

@bors: retry

[bors]

⌛ Testing commit 1cec22e with merge 74bc14d...

[bors]

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