Skip to content

Remove repetitive inlay hints (take 2) #6393

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

Merged
merged 1 commit into from
Nov 2, 2020
Merged

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Oct 28, 2020

No description provided.

@lnicola
Copy link
Member Author

lnicola commented Oct 28, 2020

#6115 is a bit of a mess history-wise, so I took the liberty to fix it and squash the commits. For the record, I made a new branch from master, added the PR as a remote, then ran:

git cherry-pick 80325b4a77e14a31eb9090f9d13da615a55d3a13 f217a1104df5969f373d827b7d40e1bc6c128232 7de821b60f097f98af953d23acf08c94c018aeb3 2cf362b7e0fcab55667ee9acb2e049a73055df24 9d581dd7af80aa715db2b492014a4adf0fe989c5 7bb8b97ec083b54c6dcd9e964f9b8ff1e93e7ad7 8e0604d1ced42177fce6284ab33e17f6577c797b a998d3fc991687ba7a22adc8372c5b5b149f2da9 908b0b0c37ed08a34da93e78e0b2281f89410eb1 033ce3801a6751a6c2a84872f42f866f8a1ade07 5dfbd15079dd740be1674a00e0a5e45b9709d05a

I fixed a small conflict on some use statements, finished the cherry-pick, then squashed by running:

git rebase -i @~11

and marking every commit except the first one as fixup.

This preserves @matthewsanetra as the commit author. Should they want to take it from here and make more changes, we can close this.

@matthewsanetra
Copy link
Contributor

I'd just like to pop by and say thank you! I have had quite a bit going on recently and didn't have time to try and fix the PR. Thanks again!

@matklad
Copy link
Member

matklad commented Nov 2, 2020

bors r+

Thanks @matthewsanetra and @lnicola <3

@bors
Copy link
Contributor

bors bot commented Nov 2, 2020

@bors bors bot merged commit d021dbe into rust-lang:master Nov 2, 2020
@lnicola lnicola deleted the param-inlays branch November 2, 2020 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants