Update RLS and Rustfmt #62805

Xanewok · 2019-07-19T16:05:57Z

Supersedes #62537.
Closes #62803.

Fixes fallout after #62679.

Xanewok · 2019-07-19T16:08:00Z

Except version bumps and internal cleanings from #62537 this also includes the fix for the tool breakage and updated itertools to 0.8 so I'll go ahead and r+ it myself per Centril's suggestion in the last PR:

@bors r+ p=1

bors · 2019-07-19T16:08:01Z

📌 Commit 6492b10 has been approved by Xanewok

rust-highfive · 2019-07-19T18:34:07Z

The job LinuxTools of your PR failed (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.

2019-07-19T16:06:29.8932068Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-19T16:06:29.9132157Z ##[command]git config gc.auto 0
2019-07-19T16:06:29.9221621Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-19T16:06:29.9270338Z ##[command]git config --get-all http.proxy
2019-07-19T16:06:29.9400817Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/62805/merge:refs/remotes/pull/62805/merge
---
2019-07-19T16:07:04.0395160Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-19T16:07:04.0395453Z 
2019-07-19T16:07:04.0395854Z   git checkout -b <new-branch-name>
2019-07-19T16:07:04.0396070Z 
2019-07-19T16:07:04.0396295Z HEAD is now at cef2936a6 Merge 6492b107f61a032ed016058004e2bb1920f99dec into 527dce7137f7a3c7bf47d9a503abf25f88ea22de
2019-07-19T16:07:04.0517685Z ##[section]Finishing: Checkout
2019-07-19T16:07:04.0525027Z ##[section]Starting: Decide whether to run this job
2019-07-19T16:07:04.0527513Z Task         : Bash
2019-07-19T16:07:04.0527676Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-19T16:07:04.0527721Z Version      : 3.151.2
2019-07-19T16:07:04.0527779Z Author       : Microsoft Corporation
2019-07-19T16:07:04.0527779Z Author       : Microsoft Corporation
2019-07-19T16:07:04.0527825Z Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2019-07-19T16:07:04.0527873Z ==============================================================================
2019-07-19T16:07:04.1867648Z Generating script.
2019-07-19T16:07:04.1897410Z ========================== Starting Command Output ===========================
2019-07-19T16:07:04.1918067Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/cbaf9c7f-666b-4487-abee-c1b45812e922.sh
2019-07-19T16:07:04.2237121Z Executing the job since submodules are updated
2019-07-19T16:07:04.2327419Z ##[section]Finishing: Decide whether to run this job
2019-07-19T16:07:04.2337125Z ==============================================================================
2019-07-19T16:07:04.2337194Z Task         : Bash
2019-07-19T16:07:04.2337264Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-19T16:07:04.2337301Z Version      : 3.151.2
---
2019-07-19T18:33:32.6398985Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-19T18:33:32.6400353Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:32.6400433Z [master 1ab3f4c] (linux CI update)
2019-07-19T18:33:32.6401194Z  1 file changed, 1 insertion(+)
2019-07-19T18:33:33.3170195Z remote: Invalid username or password.
2019-07-19T18:33:33.3170979Z fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate.git/'
2019-07-19T18:33:34.6766353Z  * branch            master     -> FETCH_HEAD
2019-07-19T18:33:34.6939253Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:34.7074447Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-19T18:33:34.7074791Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:34.7074791Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:34.7275535Z [master abd7bbf] (linux CI update)
2019-07-19T18:33:34.7275609Z  1 file changed, 1 insertion(+)
2019-07-19T18:33:35.0587706Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-19T18:33:38.4096957Z  * branch            master     -> FETCH_HEAD
2019-07-19T18:33:38.4249783Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:38.4366244Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-19T18:33:38.4366533Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:38.4366533Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:38.4577811Z [master 833ef43] (linux CI update)
2019-07-19T18:33:38.4577936Z  1 file changed, 1 insertion(+)
2019-07-19T18:33:38.7728799Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-19T18:33:40.1349689Z  * branch            master     -> FETCH_HEAD
2019-07-19T18:33:40.1514219Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:40.1657451Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-19T18:33:40.1658493Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:40.1658493Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:40.1842058Z [master 588ed74] (linux CI update)
2019-07-19T18:33:40.1842300Z  1 file changed, 1 insertion(+)
2019-07-19T18:33:40.5068402Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-19T18:33:40.8634987Z  * branch            master     -> FETCH_HEAD
2019-07-19T18:33:40.8803790Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:40.8931077Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-19T18:33:40.8931403Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:40.8931403Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-19T18:33:40.9104552Z [master 588ed74] (linux CI update)
2019-07-19T18:33:40.9104632Z  1 file changed, 1 insertion(+)
2019-07-19T18:33:41.2430692Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-19T18:33:43.5902402Z  * branch            master     -> FETCH_HEAD
2019-07-19T18:33:43.6102245Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:43.6102245Z HEAD is now at 8ce5dbc (linux CI update)
2019-07-19T18:33:44.5704832Z ##[error]Bash exited with code '1'.
2019-07-19T18:33:44.5741474Z ##[section]Starting: Checkout
2019-07-19T18:33:44.5743150Z ==============================================================================
2019-07-19T18:33:44.5743218Z Task         : Get sources
2019-07-19T18:33:44.5743263Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 · 2019-07-19T21:11:18Z

🔒 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:

git checkout update-rls (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-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.

Xanewok · 2019-07-20T14:19:06Z

Rebased, failure is spurious (2019-07-19T18:33:41.2430692Z fatal: could not read Username for 'https://github.com': No such device or address) so...

@bors r+

bors · 2019-07-20T14:19:07Z

📌 Commit bfd033cea63c7e8749725d19831c38fdc3263788 has been approved by Xanewok

rust-highfive · 2019-07-20T16:30:51Z

The job LinuxTools of your PR failed (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.

2019-07-20T14:18:01.0162325Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-20T14:18:01.0336195Z ##[command]git config gc.auto 0
2019-07-20T14:18:01.0406358Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-20T14:18:01.0454239Z ##[command]git config --get-all http.proxy
2019-07-20T14:18:01.0570936Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/62805/merge:refs/remotes/pull/62805/merge
---
2019-07-20T14:18:36.0749662Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-20T14:18:36.0749896Z 
2019-07-20T14:18:36.0750285Z   git checkout -b <new-branch-name>
2019-07-20T14:18:36.0750502Z 
2019-07-20T14:18:36.0750691Z HEAD is now at a499249ec Merge bfd033cea63c7e8749725d19831c38fdc3263788 into f69b07144a151f46aaee1b6230ba4160e9394562
2019-07-20T14:18:36.0868394Z ##[section]Finishing: Checkout
2019-07-20T14:18:36.0874184Z ##[section]Starting: Decide whether to run this job
2019-07-20T14:18:36.0876928Z Task         : Bash
2019-07-20T14:18:36.0876979Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-20T14:18:36.0877013Z Version      : 3.151.2
2019-07-20T14:18:36.0877046Z Author       : Microsoft Corporation
2019-07-20T14:18:36.0877046Z Author       : Microsoft Corporation
2019-07-20T14:18:36.0877100Z Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2019-07-20T14:18:36.0877137Z ==============================================================================
2019-07-20T14:18:36.2058425Z Generating script.
2019-07-20T14:18:36.2085685Z ========================== Starting Command Output ===========================
2019-07-20T14:18:36.2106517Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/d8f55ecf-aa59-4e63-8c39-dc12ae76a648.sh
2019-07-20T14:18:36.2617636Z Executing the job since submodules are updated
2019-07-20T14:18:36.2696478Z ##[section]Finishing: Decide whether to run this job
2019-07-20T14:18:36.2706309Z ==============================================================================
2019-07-20T14:18:36.2706359Z Task         : Bash
2019-07-20T14:18:36.2706571Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-20T14:18:36.2706611Z Version      : 3.151.2
---
2019-07-20T16:30:20.4122633Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-20T16:30:21.2215358Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:21.2215433Z [master 7927d4c] (linux CI update)
2019-07-20T16:30:21.2215473Z  1 file changed, 1 insertion(+)
2019-07-20T16:30:21.2215528Z remote: Invalid username or password.
2019-07-20T16:30:21.2215787Z fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate.git/'
2019-07-20T16:30:22.4716069Z  * branch            master     -> FETCH_HEAD
2019-07-20T16:30:22.4894030Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:22.5009236Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-20T16:30:22.5009559Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:22.5009559Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:22.5187275Z [master f6c92e1] (linux CI update)
2019-07-20T16:30:22.5187341Z  1 file changed, 1 insertion(+)
2019-07-20T16:30:22.8357969Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-20T16:30:25.1804313Z  * branch            master     -> FETCH_HEAD
2019-07-20T16:30:25.1944184Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:25.2049280Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-20T16:30:25.2050176Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:25.2050176Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:25.2205896Z [master 88634d8] (linux CI update)
2019-07-20T16:30:25.2206433Z  1 file changed, 1 insertion(+)
2019-07-20T16:30:25.5303628Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-20T16:30:28.8965854Z  * branch            master     -> FETCH_HEAD
2019-07-20T16:30:28.9097100Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:28.9198140Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-20T16:30:28.9200031Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:28.9200031Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:28.9353089Z [master e9cb9c5] (linux CI update)
2019-07-20T16:30:28.9353520Z  1 file changed, 1 insertion(+)
2019-07-20T16:30:29.2422642Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-20T16:30:29.5814457Z  * branch            master     -> FETCH_HEAD
2019-07-20T16:30:29.5954385Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:29.6056141Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-20T16:30:29.6056425Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:29.6056425Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-20T16:30:29.6220421Z [master 1d7dd6d] (linux CI update)
2019-07-20T16:30:29.6220523Z  1 file changed, 1 insertion(+)
2019-07-20T16:30:29.9448112Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-20T16:30:31.2790279Z  * branch            master     -> FETCH_HEAD
2019-07-20T16:30:31.2923865Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:31.2923865Z HEAD is now at c880e6c (windows CI update)
2019-07-20T16:30:32.2531117Z ##[error]Bash exited with code '1'.
2019-07-20T16:30:32.2587459Z ##[section]Starting: Checkout
2019-07-20T16:30:32.2589553Z ==============================================================================
2019-07-20T16:30:32.2589609Z Task         : Get sources
2019-07-20T16:30:32.2589675Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 · 2019-07-20T18:03:03Z

🔒 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:

git checkout update-rls (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-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.

Xanewok · 2019-07-21T10:49:48Z

Rebased

@bors r+

bors · 2019-07-21T10:49:49Z

📌 Commit 7c37c9b9722c1facd17cf9946db4cc843cbd9c56 has been approved by Xanewok

bors · 2019-07-21T12:33:18Z

🔒 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:

git checkout update-rls (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self update-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.

rust-highfive · 2019-07-21T13:04:09Z

The job LinuxTools of your PR failed (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.

2019-07-21T10:45:54.5629116Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-21T10:45:54.5808086Z ##[command]git config gc.auto 0
2019-07-21T10:45:54.5884019Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-21T10:45:54.5934361Z ##[command]git config --get-all http.proxy
2019-07-21T10:45:55.3407721Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/62805/merge:refs/remotes/pull/62805/merge
---
2019-07-21T10:46:28.5795843Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-21T10:46:28.5795872Z 
2019-07-21T10:46:28.5796102Z   git checkout -b <new-branch-name>
2019-07-21T10:46:28.5796133Z 
2019-07-21T10:46:28.5796182Z HEAD is now at 1a33eec6e Merge 7c37c9b9722c1facd17cf9946db4cc843cbd9c56 into 1301422a6c2e8916560b8cc2f0564f38d8858a75
2019-07-21T10:46:28.5932966Z ##[section]Finishing: Checkout
2019-07-21T10:46:28.5940418Z ##[section]Starting: Decide whether to run this job
2019-07-21T10:46:28.5943457Z Task         : Bash
2019-07-21T10:46:28.5943504Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-21T10:46:28.5943549Z Version      : 3.151.2
2019-07-21T10:46:28.5943610Z Author       : Microsoft Corporation
2019-07-21T10:46:28.5943610Z Author       : Microsoft Corporation
2019-07-21T10:46:28.5943659Z Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2019-07-21T10:46:28.5943709Z ==============================================================================
2019-07-21T10:46:28.7336097Z Generating script.
2019-07-21T10:46:28.7367179Z ========================== Starting Command Output ===========================
2019-07-21T10:46:28.7387407Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/64009ae2-6db4-4fe1-aecd-ef35cc0d3251.sh
2019-07-21T10:46:29.0142929Z Executing the job since submodules are updated
2019-07-21T10:46:29.0233399Z ##[section]Finishing: Decide whether to run this job
2019-07-21T10:46:29.0243712Z ==============================================================================
2019-07-21T10:46:29.0243773Z Task         : Bash
2019-07-21T10:46:29.0243821Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-21T10:46:29.0243906Z Version      : 3.151.2
---
2019-07-21T13:03:32.5918871Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-21T13:03:32.5919239Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:32.6157271Z [master d8e1ba5] (linux CI update)
2019-07-21T13:03:32.6157361Z  1 file changed, 1 insertion(+)
2019-07-21T13:03:33.3272128Z remote: Invalid username or password.
2019-07-21T13:03:33.3272943Z fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate.git/'
2019-07-21T13:03:35.6691479Z  * branch            master     -> FETCH_HEAD
2019-07-21T13:03:35.6884439Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:35.6994046Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-21T13:03:35.6995048Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:35.6995048Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:35.7177105Z [master 36f6a93] (linux CI update)
2019-07-21T13:03:35.7178292Z  1 file changed, 1 insertion(+)
2019-07-21T13:03:36.0479469Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-21T13:03:37.4060135Z  * branch            master     -> FETCH_HEAD
2019-07-21T13:03:37.4210264Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:37.4324438Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-21T13:03:37.4324747Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:37.4324747Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:37.4509258Z [master 826114a] (linux CI update)
2019-07-21T13:03:37.4509454Z  1 file changed, 1 insertion(+)
2019-07-21T13:03:37.7652332Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-21T13:03:38.1063776Z  * branch            master     -> FETCH_HEAD
2019-07-21T13:03:38.1219321Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:38.1333706Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-21T13:03:38.1334019Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:38.1334019Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:38.1513631Z [master 632a4cd] (linux CI update)
2019-07-21T13:03:38.1513742Z  1 file changed, 1 insertion(+)
2019-07-21T13:03:38.4698153Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-21T13:03:41.8102866Z  * branch            master     -> FETCH_HEAD
2019-07-21T13:03:41.8250901Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:41.8365097Z The state of "rls" has changed from "build-fail" to "test-pass"
2019-07-21T13:03:41.8365391Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:41.8365391Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-21T13:03:41.8538696Z [master 18d5336] (linux CI update)
2019-07-21T13:03:41.8539109Z  1 file changed, 1 insertion(+)
2019-07-21T13:03:42.1759722Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-21T13:03:45.5300662Z  * branch            master     -> FETCH_HEAD
2019-07-21T13:03:45.5462204Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:45.5462204Z HEAD is now at ffda10e (windows CI update)
2019-07-21T13:03:46.4554957Z ##[error]Bash exited with code '1'.
2019-07-21T13:03:46.4592474Z ##[section]Starting: Checkout
2019-07-21T13:03:46.4594338Z ==============================================================================
2019-07-21T13:03:46.4594392Z Task         : Get sources
2019-07-21T13:03:46.4594437Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 · 2019-07-21T22:18:19Z

Rebased 😭

@bors r+

bors · 2019-07-21T22:18:20Z

📌 Commit c97dfb5 has been approved by Xanewok

@ghost

Update RLS and Rustfmt Supersedes rust-lang#62537. Closes rust-lang#62803. Fixes fallout after rust-lang#62679. r? @ghost

bors · 2019-07-30T13:51:40Z

⌛ Testing commit ab27d67 with merge e2eb571...

@ghost

Update RLS and Rustfmt Supersedes #62537. Closes #62803. Fixes fallout after #62679. r? @ghost

bors · 2019-07-30T15:19:26Z

💔 Test failed - checks-azure

rust-highfive · 2019-07-30T15:19:26Z

The job dist-x86_64-apple-alt of your PR failed (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.

2019-07-30T15:16:16.1731460Z [RUSTC-TIMING] git_rustfmt test:false 13.026
2019-07-30T15:16:17.9449000Z [RUSTC-TIMING] rustfmt test:false 14.584
2019-07-30T15:16:18.1271420Z [RUSTC-TIMING] cargo_fmt test:false 14.977
2019-07-30T15:16:18.1386210Z     Finished release [optimized] target(s) in 3m 16s
2019-07-30T15:16:18.1660560Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2019-07-30T15:16:18.1661400Z 
2019-07-30T15:16:18.1661940Z the following dependencies are duplicated although they have the same features enabled:
2019-07-30T15:16:18.1662060Z the following dependencies have different features:
2019-07-30T15:16:18.1663990Z   crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)
2019-07-30T15:16:18.1665450Z     `rustfmt` additionally enabled features {"nightly"} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-fa2f84e255425f57.rlib"
2019-07-30T15:16:18.1666760Z     `cargo` additionally enabled features {} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-14a10190b65c6999.rlib"
2019-07-30T15:16:18.1667160Z 
2019-07-30T15:16:18.1668150Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
2019-07-30T15:16:18.1669250Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-07-30T15:16:18.1764340Z failed to run: /Users/vsts/agent/2.154.3/work/1/s/build/bootstrap/debug/bootstrap dist
2019-07-30T15:16:18.1764480Z Build completed unsuccessfully in 1:19:00
2019-07-30T15:16:18.1764480Z Build completed unsuccessfully in 1:19:00
2019-07-30T15:16:18.2016700Z ##[error]Bash exited with code '1'.
2019-07-30T15:16:18.2062030Z ##[section]Starting: Upload CPU usage statistics
2019-07-30T15:16:18.2088870Z ==============================================================================
2019-07-30T15:16:18.2088980Z Task         : Bash
2019-07-30T15:16:18.2089070Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

Last two commits bumped rustc-ap-* crates which also transitively updated rustc_data_structures. That crate enables the "nightly" whereas Cargo's dep does not hence why we need to unify the features to deduplicate the artifacts.

Xanewok · 2019-07-30T16:13:23Z

Unified crossbeam-utils features used in tools and verified the fix locally:

@bors r+

bors · 2019-07-30T16:13:24Z

📌 Commit 1b61db7 has been approved by Xanewok

bors · 2019-07-30T16:59:19Z

⌛ Testing commit 1b61db7 with merge dddb7fc...

@ghost

Update RLS and Rustfmt Supersedes #62537. Closes #62803. Fixes fallout after #62679. r? @ghost

SimonSapin · 2019-07-30T19:32:10Z

The rollup #63134 failed, most likely because of this PR:

2019-07-30T13:49:41.8022060Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2019-07-30T13:49:41.8022610Z 
2019-07-30T13:49:41.8022740Z the following dependencies are duplicated although they have the same features enabled:
2019-07-30T13:49:41.8023220Z the following dependencies have different features:
2019-07-30T13:49:41.8024190Z   crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)
2019-07-30T13:49:41.8025120Z     `rustfmt` additionally enabled features {"nightly"} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-6c8cd67381bcfe02.rlib"
2019-07-30T13:49:41.8026150Z     `cargo` additionally enabled features {} at "/Users/vsts/agent/2.154.3/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libcrossbeam_utils-683657da3f16e5d0.rlib"
2019-07-30T13:49:41.8026300Z 
2019-07-30T13:49:41.8027090Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set

Xanewok · 2019-07-30T19:34:07Z

@SimonSapin yep, fixed in 1b61db7 (already being tested)

bors · 2019-07-30T20:48:43Z

☀️ Test successful - checks-azure
Approved by: Xanewok
Pushing dddb7fc to master...

rust-highfive · 2019-07-30T20:49:49Z

📣 Toolstate changed by #62805!

Tested on commit dddb7fc.
Direct link to PR: #62805

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

@Xanewok

Tested on commit rust-lang/rust@dddb7fc. Direct link to PR: <rust-lang/rust#62805> 🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra). 🎉 rustfmt on windows: build-fail → test-pass (cc @topecongiro, @rust-lang/infra).

ehuss · 2019-07-30T21:03:13Z

Just a heads up, the toolstate publish isn't working for linux, so it will still appear to be build-fail until it's fixed.

est31 · 2019-07-30T21:16:58Z

@ehuss what do you mean by that? Will the next nightly be available for rustup users who have rls enabled?

ehuss · 2019-07-30T21:22:47Z

I'm not 100% certain how rustup works, but I think it should be OK. I think the main consequence is that https://rust-lang-nursery.github.io/rust-toolstate/ will show it is still failing. I believe it will be fixed soon, regardless.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 19, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 19, 2019

Xanewok force-pushed the update-rls branch from 6492b10 to bfd033c Compare July 20, 2019 14:17

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 Jul 20, 2019

Xanewok mentioned this pull request Jul 20, 2019

LinuxTools builders fails to (mabye?) push at the end of PR builds #62811

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 20, 2019

Xanewok force-pushed the update-rls branch from bfd033c to 7c37c9b Compare July 21, 2019 10:45

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 Jul 21, 2019

Xanewok mentioned this pull request Jul 21, 2019

rustup https://github.com/rust-lang/rust/pull/62679/ rust-lang/rls#1517

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 21, 2019

Xanewok force-pushed the update-rls branch from 7c37c9b to c97dfb5 Compare July 21, 2019 22:16

Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019

Rollup merge of rust-lang#62805 - Xanewok:update-rls, r=Xanewok

14eddad

Update RLS and Rustfmt Supersedes rust-lang#62537. Closes rust-lang#62803. Fixes fallout after rust-lang#62679. r? @ghost

Centril mentioned this pull request Jul 30, 2019

Rollup of 4 pull requests #63134

Closed

bors added a commit that referenced this pull request Jul 30, 2019

Auto merge of #62805 - Xanewok:update-rls, r=Xanewok

e2eb571

Update RLS and Rustfmt Supersedes #62537. Closes #62803. Fixes fallout after #62679. r? @ghost

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 Jul 30, 2019

Enable nightly feature for crossbeam-utils dep

1b61db7

Last two commits bumped rustc-ap-* crates which also transitively updated rustc_data_structures. That crate enables the "nightly" whereas Cargo's dep does not hence why we need to unify the features to deduplicate the artifacts.

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 Jul 30, 2019

bors added a commit that referenced this pull request Jul 30, 2019

Auto merge of #62805 - Xanewok:update-rls, r=Xanewok

dddb7fc

Update RLS and Rustfmt Supersedes #62537. Closes #62803. Fixes fallout after #62679. r? @ghost

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 30, 2019

bors merged commit 1b61db7 into rust-lang:master Jul 30, 2019

topecongiro mentioned this pull request Jul 31, 2019

rusfmt is missing for all Tier1 platforms since 2019-07-26 rust-lang/rustfmt#3713

Closed

mitchmindtree mentioned this pull request Aug 4, 2019

lyon 2D tessellation integration - Fixes many 2D bugs, adds support for stroke tessellation, Paths, curves and more. nannou-org/nannou#375

Merged

chrissimpkins mentioned this pull request Feb 9, 2020

ICE from associated const in field type of lifetime-parametric struct #68875

Closed

dtolnay mentioned this pull request May 28, 2024

Rustfmt misaligns doc comment between rustfmt::skip modules rust-lang/rustfmt#6176

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update RLS and Rustfmt #62805

Update RLS and Rustfmt #62805

Xanewok commented Jul 19, 2019 •

edited

Loading

Xanewok commented Jul 19, 2019

bors commented Jul 19, 2019

rust-highfive commented Jul 19, 2019

bors commented Jul 19, 2019

Xanewok commented Jul 20, 2019

bors commented Jul 20, 2019

rust-highfive commented Jul 20, 2019

bors commented Jul 20, 2019

Xanewok commented Jul 21, 2019

bors commented Jul 21, 2019

bors commented Jul 21, 2019

rust-highfive commented Jul 21, 2019

Xanewok commented Jul 21, 2019

bors commented Jul 21, 2019

bors commented Jul 30, 2019

bors commented Jul 30, 2019

rust-highfive commented Jul 30, 2019

Xanewok commented Jul 30, 2019

bors commented Jul 30, 2019

bors commented Jul 30, 2019

SimonSapin commented Jul 30, 2019

Xanewok commented Jul 30, 2019

bors commented Jul 30, 2019

rust-highfive commented Jul 30, 2019

ehuss commented Jul 30, 2019

est31 commented Jul 30, 2019

ehuss commented Jul 30, 2019

Update RLS and Rustfmt #62805

Update RLS and Rustfmt #62805

Conversation

Xanewok commented Jul 19, 2019 • edited Loading

Xanewok commented Jul 19, 2019

bors commented Jul 19, 2019

rust-highfive commented Jul 19, 2019

bors commented Jul 19, 2019

Xanewok commented Jul 20, 2019

bors commented Jul 20, 2019

rust-highfive commented Jul 20, 2019

bors commented Jul 20, 2019

Xanewok commented Jul 21, 2019

bors commented Jul 21, 2019

bors commented Jul 21, 2019

rust-highfive commented Jul 21, 2019

Xanewok commented Jul 21, 2019

bors commented Jul 21, 2019

bors commented Jul 30, 2019

bors commented Jul 30, 2019

rust-highfive commented Jul 30, 2019

Xanewok commented Jul 30, 2019

bors commented Jul 30, 2019

bors commented Jul 30, 2019

SimonSapin commented Jul 30, 2019

Xanewok commented Jul 30, 2019

bors commented Jul 30, 2019

rust-highfive commented Jul 30, 2019

ehuss commented Jul 30, 2019

est31 commented Jul 30, 2019

ehuss commented Jul 30, 2019

Xanewok commented Jul 19, 2019 •

edited

Loading