Skip to content

Conversation

jplatte
Copy link
Member

@jplatte jplatte commented Jun 12, 2025

Closes #3306.

@jplatte jplatte requested a review from hds June 12, 2025 15:00
@jplatte jplatte requested review from hawkw and a team as code owners June 12, 2025 15:00
Copy link
Contributor

@hds hds left a 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.

@hds hds changed the title Fix tracing::instrument regression around shadowing attributes: fix tracing::instrument regression around shadowing Jun 13, 2025
@hds hds merged commit 6e59a13 into main Jun 13, 2025
56 checks passed
@hds hds deleted the jplatte/fix-regression branch June 13, 2025 10:05
@jplatte
Copy link
Member Author

jplatte commented Jun 13, 2025

@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)

@hds
Copy link
Contributor

hds commented Jun 13, 2025

@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).

@jplatte
Copy link
Member Author

jplatte commented Jun 13, 2025

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?

@hds
Copy link
Contributor

hds commented Jun 13, 2025

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).

hds added a commit that referenced this pull request Jun 17, 2025
# 0.1.30 (June 18, 2025)

### Fixed

- Fix `tracing::instrument` regression around shadowing ([#3311])

[#3311]: #3311
hds added a commit that referenced this pull request Jun 17, 2025
# 0.1.30 (June 17, 2025)

### Fixed

- Fix `tracing::instrument` regression around shadowing ([#3311])

[#3311]: #3311
hds added a commit that referenced this pull request Jun 17, 2025
# 0.1.30 (June 17, 2025)

### Fixed

- Fix `tracing::instrument` regression around shadowing ([#3311])

[#3311]: #3311
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.

instrument macro can make functions not compile as of 0.1.29
2 participants