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

[stable] stable 1.44.1 #73424

Merged
merged 1 commit into from
Jun 18, 2020
Merged

[stable] stable 1.44.1 #73424

merged 1 commit into from
Jun 18, 2020

Conversation

Mark-Simulacrum
Copy link
Member

Another backport for 1.44.1, fixing rust-lang/rust-clippy#5356.

r? @ghost

@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1000 rollup=never

Hopefully the last backport to this point release...

@bors
Copy link
Contributor

bors commented Jun 16, 2020

📌 Commit 0a53b3aa30657f78887bafce50a8ea06b7f338d8 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 16, 2020
@ehuss
Copy link
Contributor

ehuss commented Jun 16, 2020

Looks like RLS will need to be updated, too.

error[E0061]: this function takes 1 argument but 2 arguments were supplied
  --> src/tools/rls/rls-rustc/src/clippy.rs:62:9
   |
62 |         clippy_lints::register_pre_expansion_lints(&mut lint_store, &conf);
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---------------  ----- supplied 2 arguments
   |         |
   |         expected 1 argument

error: aborting due to previous error

For more information about this error, try `rustc --explain E0061`.
error: could not compile `rls-rustc`.

@ehuss
Copy link
Contributor

ehuss commented Jun 16, 2020

This is going to fail.
@bors r-
(I hope you don't mind the r-, just didn't want to waste queue time.)

@bors 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 Jun 16, 2020
@Dylan-DPC-zz
Copy link

@ehuss no worries, that's the right thing to do :)

@Dylan-DPC-zz
Copy link

For those who don't like scrolling through a 9k long log :

Cloning into 'rust-toolstate'...
error: Tool `rls` should be test-pass but is build-fail
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test check-tools

cc @Xanewok just in case

@Mark-Simulacrum
Copy link
Member Author

I'll take a look first thing tomorrow, if folks don't get to it before then. Can't wait for universal subtrees...

@Xanewok
Copy link
Member

Xanewok commented Jun 17, 2020

Does this need anything more than just removing the &conf part?
I’ll prepare a branch shortly with the fix

@ehuss
Copy link
Contributor

ehuss commented Jun 17, 2020

I noticed the release notes included something that wasn't actually added:

diff --git a/RELEASES.md b/RELEASES.md
index 45fe2e1fbb9..7de3700df95 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -2,13 +2,11 @@ Version 1.44.1 (2020-06-18)
 ===========================
 
 * [rustfmt accepts rustfmt_skip in cfg_attr again.][73078]
-* [Fix fingerprinting for lld on Windows with dylib.][cargo/8290]
 * [Don't hash executable filenames on apple platforms.][cargo/8329]
 * [Fix crashes when finding backtrace on macOS.][71397]
 
 [71397]: https://github.com/rust-lang/rust/issues/71397
 [73078]: https://github.com/rust-lang/rust/issues/73078
-[cargo/8290]: https://github.com/rust-lang/cargo/pull/8290
 [cargo/8329]: https://github.com/rust-lang/cargo/pull/8329
 
 Version 1.44.0 (2020-06-04)

For the other Cargo PR, it might be good just to briefly mention why the change was made, maybe just add (fixes backtraces) or something like that.

@Mark-Simulacrum
Copy link
Member Author

Okay I've pushed up a rust-1.44.1 branch for RLS and am testing locally (and I guess in PR CI). Will approve and likely bump queue to get this in as quickly as possible.

@Mark-Simulacrum
Copy link
Member Author

Okay, tests passed locally (had to adjust one more place in RLS). @bors r+ p=1000 rollup=neer

@bors
Copy link
Contributor

bors commented Jun 17, 2020

📌 Commit 03c622f has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 17, 2020
@bors
Copy link
Contributor

bors commented Jun 17, 2020

⌛ Testing commit 03c622f with merge c7087fe...

@bors
Copy link
Contributor

bors commented Jun 18, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing c7087fe to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 18, 2020
@bors bors merged commit c7087fe into rust-lang:stable Jun 18, 2020
@cuviper cuviper added this to the 1.44 milestone May 2, 2024
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.

6 participants