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

Merged
merged 2 commits into from May 19, 2019
Merged

Update RLS #60946

merged 2 commits into from May 19, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 18, 2019

Includes a fix (rust-lang/rls#1462) for breakage due to Cargo update PR (#60874)

r? @Manishearth @oli-obk @ehuss

@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 May 18, 2019
@ehuss
Copy link
Contributor

ehuss commented May 18, 2019

Can you also back out the override I added?

diff --git a/src/ci/docker/x86_64-gnu-tools/checkregression.py b/src/ci/docker/x86_64-gnu-tools/checkregression.py
index 8aa90319d6..0cc0a6329e 100755
--- a/src/ci/docker/x86_64-gnu-tools/checkregression.py
+++ b/src/ci/docker/x86_64-gnu-tools/checkregression.py
@@ -21,12 +21,7 @@ if __name__ == '__main__':
         state = cur[os_name]
         new_state = toolstate.get(tool, '')
         if verb == 'regressed':
-            if tool == 'rls':
-                # Temporary override until
-                # https://github.com/rust-lang/rust/issues/60848 is fixed.
-                updated = False
-            else:
-                updated = new_state < state
+            updated = new_state < state
         elif verb == 'changed':
             updated = new_state != state
         else:

@Xanewok
Copy link
Member Author

Xanewok commented May 18, 2019

Can you also back out the override I added?

Done, thanks!

@oli-obk
Copy link
Contributor

oli-obk commented May 19, 2019

@bors r+ p=2 (lets prio this over miri)

@bors
Copy link
Contributor

bors commented May 19, 2019

📌 Commit 8d41958 has been approved by oli-obk

@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 May 19, 2019
@bors
Copy link
Contributor

bors commented May 19, 2019

⌛ Testing commit 8d41958 with merge e7591c1...

bors added a commit that referenced this pull request May 19, 2019
Update RLS

Includes a fix (rust-lang/rls#1462) for breakage due to Cargo update PR (#60874)

r? @Manishearth @oli-obk @ehuss
@bors
Copy link
Contributor

bors commented May 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing e7591c1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 19, 2019
@bors bors merged commit 8d41958 into rust-lang:master May 19, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #60946!

Tested on commit e7591c1.
Direct link to PR: #60946

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 19, 2019
Tested on commit rust-lang/rust@e7591c1.
Direct link to PR: <rust-lang/rust#60946>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@Xanewok Xanewok deleted the update-rls branch May 19, 2019 14:51
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.

None yet

6 participants