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 #67198

Merged
merged 1 commit into from
Dec 11, 2019
Merged

Update RLS and Rustfmt #67198

merged 1 commit into from
Dec 11, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Dec 10, 2019

Fixes #66885

Rustfmt is bumped here to version 1.4.11
For now we pull two versions of rustfmt in Cargo.toml (RLS uses 1.4.11, rustfmt source only has 1.4.10), so

  1. it'd be great to upload the source used to publish rustfmt 1.4.11 @topecongiro
  2. I can downgrade the rustfmt used in RLS (it was an oversight on my part when merging Update rustfmt to 1.4.11 rls#1598)

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2019
@topecongiro
Copy link
Contributor

@Xanewok Sorry about that, published the source code (https://github.com/rust-lang/rustfmt/tree/rustfmt-1.4.11).

@Xanewok
Copy link
Member Author

Xanewok commented Dec 10, 2019

Thanks for such a quick response! Just bumped the rustfmt to 1.4.11 in this PR

@@ -2081,12 +2047,6 @@ dependencies = [
"winapi 0.3.8",
]

[[package]]
name = "memoffset"
version = "0.2.1"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RalfJung I'm sure you'll be happy 😉

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I am. :-)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed (pretty log, 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-12-10T15:14:13.6061120Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-10T15:14:13.6074525Z ##[command]git config gc.auto 0
2019-12-10T15:14:13.6076936Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-10T15:14:13.6080106Z ##[command]git config --get-all http.proxy
2019-12-10T15:14:13.6083643Z ##[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/67198/merge:refs/remotes/pull/67198/merge
---
2019-12-10T17:02:13.5599660Z Verifying status of edition-guide...
2019-12-10T17:02:13.5610394Z Verifying status of rls...
2019-12-10T17:02:13.5622194Z This PR updated 'src/tools/rls', verifying if status is 'test-pass'...
2019-12-10T17:02:13.5630863Z 
2019-12-10T17:02:13.5632185Z ⚠️ We detected that this PR updated 'rls', but its tests failed.
2019-12-10T17:02:13.5632252Z 
2019-12-10T17:02:13.5632496Z If you do intend to update 'rls', please check the error messages above and
2019-12-10T17:02:13.5632539Z commit another update.
2019-12-10T17:02:13.5632561Z 
2019-12-10T17:02:13.5632755Z If you do NOT intend to update 'rls', please ensure you did not accidentally
2019-12-10T17:02:13.5632966Z change the submodule at 'src/tools/rls'. You may ask your reviewer for the
2019-12-10T17:02:13.5633004Z proper steps.
2019-12-10T17:02:13.5648122Z   local time: Tue Dec 10 17:02:13 UTC 2019
2019-12-10T17:02:13.8358946Z   network time: Tue, 10 Dec 2019 17:02:13 GMT
2019-12-10T17:02:13.8362543Z == end clock drift check ==
2019-12-10T17:02:14.3552518Z 
2019-12-10T17:02:14.3552518Z 
2019-12-10T17:02:14.3632950Z ##[error]Bash exited with code '3'.
2019-12-10T17:02:14.3660964Z ##[section]Starting: Checkout
2019-12-10T17:02:14.3662424Z ==============================================================================
2019-12-10T17:02:14.3662466Z Task         : Get sources
2019-12-10T17:02:14.3662519Z 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)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 10, 2019

📌 Commit 5b09130 has been approved by nikomatsakis

@bors 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 Dec 10, 2019
@tmandry
Copy link
Member

tmandry commented Dec 11, 2019

@bors p=1
Fixes toolstate, RLS has been broken for >1 week

@bors
Copy link
Contributor

bors commented Dec 11, 2019

⌛ Testing commit 5b09130 with merge a233302...

bors added a commit that referenced this pull request Dec 11, 2019
Update RLS and Rustfmt

Fixes #66885

Rustfmt is bumped here to version 1.4.11
~For now we pull two versions of rustfmt in Cargo.toml (RLS uses 1.4.11, rustfmt source only has 1.4.10), so~
1. ~it'd be great to upload the source used to publish rustfmt 1.4.11 @topecongiro~
2. ~I can downgrade the rustfmt used in RLS (it was an oversight on my part when merging rust-lang/rls#1598
@bors
Copy link
Contributor

bors commented Dec 11, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing a233302 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 11, 2019
@bors bors merged commit 5b09130 into rust-lang:master Dec 11, 2019
@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, 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.

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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rls no longer builds after rust-lang/rust#66879
7 participants