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 RLS and Rustfmt and Cargo #46929

Closed
wants to merge 2 commits into from
Closed

Update RLS and Rustfmt and Cargo #46929

wants to merge 2 commits into from

Conversation

nrc
Copy link
Member

@nrc nrc commented Dec 21, 2017

No description provided.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@nrc
Copy link
Member Author

nrc commented Dec 21, 2017

@bors: r=me p=1

@nrc
Copy link
Member Author

nrc commented Dec 21, 2017

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Dec 21, 2017

📌 Commit 85adcea has been approved by nrc

@nrc
Copy link
Member Author

nrc commented Dec 22, 2017

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit 4743f0a has been approved by nrc

@alexcrichton
Copy link
Member

@nrc with rust-lang/rls#635 mind if I throw that plus the cargo update in here as well?

@nrc
Copy link
Member Author

nrc commented Dec 22, 2017

@alexcrichton sure! I can do that - I still have the branch ready

@nrc
Copy link
Member Author

nrc commented Dec 22, 2017

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit f742a64 has been approved by nrc

@nrc nrc changed the title Update RLS and Rustfmt Update RLS and Rustfmt and Cargo Dec 22, 2017
@alexcrichton
Copy link
Member

I pushed an extra commit to update the git2 binding as well, but feel free to squash it away if something else on this branch changes

@bors: r=nrc

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit 3a1805a has been approved by nrc

@bors
Copy link
Contributor

bors commented Dec 22, 2017

⌛ Testing commit 3a1805a7d2151029e8ead6c92082876cbf9fbe7c with merge e60ba040a4ff947d490cf8d572146c8c3743c3b5...

@bors
Copy link
Contributor

bors commented Dec 22, 2017

💔 Test failed - status-appveyor

@nrc
Copy link
Member Author

nrc commented Dec 22, 2017

@bors: retry

@kennytm
Copy link
Member

kennytm commented Dec 22, 2017

@bors r-

I'm pretty sure the errors are legit. The failing test cases are:

  1. https_something_happens. The test tries to connect to https://127.0.0.1:*/ which should be serving invalid response. It is expected to contain the string "failed to send request". Instead, the output was:
    Updating git repository `https://127.0.0.1:2858/foo/bar`
error: failed to load source for a dependency on `bar`
Caused by:
  Unable to update https://127.0.0.1:2858/foo/bar
Caused by:
  failed to clone into: C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t0\home\.cargo\git\db\bar-bb0ae0d2822494b3
Caused by:
  [35] SSL connect error (schannel: failed to receive handshake, SSL/TLS connection failed); class=Net (12)
', C:\Users\appveyor\.cargo\registry\src\github.com-1ecc6299db9ec823\hamcrest-0.1.1\src\core.rs:31:12
note: Run with `RUST_BACKTRACE=1` for a backtrace.
  1. http_auth_offered. Authorization failure (HTTP 401) happens as expected, but again, the error message differs.
 10 - |  failed to authenticate when downloading repository|
    + |  failed to receive HTTP 200 response: got 401; class=Net (12)|
 11 - |attempted to find username/password via `credential.helper`, but [..]|
    +
 12 - ||
    +
 13 - |To learn more, run the command again with --verbose.|
    +

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 22, 2017
@alexcrichton
Copy link
Member

I think rust-lang/cargo#4856 should fix that issue

@alexcrichton
Copy link
Member

@bors: r=nrc

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit 0f83031 has been approved by nrc

@kennytm kennytm 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 Dec 22, 2017
@bors
Copy link
Contributor

bors commented Dec 22, 2017

⌛ Testing commit 0f83031 with merge 2a3a73167e117eebb831c77276ddee714cbe2521...

@bors
Copy link
Contributor

bors commented Dec 22, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 22, 2017

rustfmt is still broken.

[01:00:33] error[E0063]: missing field `recovered` in initializer of `syntax::ast::Block`
[01:00:33]    --> /checkout/src/tools/rustfmt/src/closures.rs:127:17
[01:00:33]     |
[01:00:33] 127 |     let block = ast::Block {
[01:00:33]     |                 ^^^^^^^^^^ missing `recovered`
[01:00:33] 
[01:00:36] error: aborting due to previous error

@kennytm kennytm 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 Dec 22, 2017
@alexcrichton
Copy link
Member

Ok, I've approved #46630 in the meantime to get the incremental-by-default builds out in Cargo, but @nrc if this ends up landing before that I'll close it!

@nrc
Copy link
Member Author

nrc commented Dec 23, 2017

rustfmt is still broken.

Rustfmt has been broken again, to be precise :-(

@topecongiro
Copy link
Contributor

rustfmt is fixed on 0.3.4.

@estebank
Copy link
Contributor

estebank commented Dec 23, 2017

Rustfmt has been broken again, to be precise :-(

@nrc @alexcrichton that'd be my fault. I didn't push a PR to cargo to fix it because I didn't realize the new field had landed in rustc yet.

@bors
Copy link
Contributor

bors commented Dec 24, 2017

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

bors added a commit that referenced this pull request Dec 29, 2017
Update RLS and Rustfmt

Essentially #46929 with only RLS update that fixes the build.

The rls wasn't included in the recent nightlies and a lot of people have been wondering what to do about it, so it'd be good to include the RLS back with the nightly builds as soon as we can.

r? @alexcrichton
@MaloJaffre MaloJaffre mentioned this pull request Dec 30, 2017
10 tasks
@kennytm
Copy link
Member

kennytm commented Jan 1, 2018

Since rls and rustfmt has been updated in #47051 and cargo in #47052, this PR is no longer necessary. Closing.

@kennytm kennytm closed this Jan 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants