-
Notifications
You must be signed in to change notification settings - Fork 825
attributes: fix tracing::instrument regression around shadowing #3311
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much for this fix! I think the pass ui test can become a normal integration test, then we're good to go in.
Documents test.
@hds could you please not merge PRs on my behalf? I was about to squash your commit and rebase-merge for a clean history. (no hard feelings though) |
@jplatte I'll keep that in mind in the future. But please follow the style of the project. We always squash merge so that each PR results in only a single commit (again, for a clean history). |
Alright, in that case you can ignore my ask. I can try to keep this in mind, but I have a strong habit to merge PRs with cleanly-separated commits using rebase-merge. Maybe we should have an admin disable rebase-merge for this repo if it's unwanted? |
There is an exception where we use rebase-merge and that's for backporting, since we want all the commits in more or less as they were in the other branch. Forward porting is likely to be done the same now that we'll be putting PRs into the branch we release off. Only tokio-rs members can merge, so we're sort of hoping that this small group of people follow the convention of the project (in the last few years, it's mostly only been Eliza, David, and myself merging PRs anyway). |
Closes #3306.