Skip to content

split Tool and ToolFamily to a new tool module#929

Merged
NobodyXu merged 1 commit into
rust-lang:mainfrom
Be-ing:tool_mod
Jan 30, 2024
Merged

split Tool and ToolFamily to a new tool module#929
NobodyXu merged 1 commit into
rust-lang:mainfrom
Be-ing:tool_mod

Conversation

@Be-ing

@Be-ing Be-ing commented Jan 29, 2024

Copy link
Copy Markdown
Contributor

No description provided.

@NobodyXu

Copy link
Copy Markdown
Contributor

I'm ok with this changes, but I'm afraid of creating merge conflicts that's a bit hard to fix in other PRs.

cc @thomcc what's your thought on this?

@Be-ing

Be-ing commented Jan 29, 2024

Copy link
Copy Markdown
Contributor Author

This is just moving code from one file to another. Merge conflicts should be pretty easy to resolve.

@NobodyXu

Copy link
Copy Markdown
Contributor

This is just moving code from one file to another. Merge conflicts should be pretty easy to resolve.

If someone modifies tool impl (e.g. #932 ) then it will have to rewrote it by moving changes into the new file.

Wirh rhat said, if #932 is the only PR that will have a merge conflict, then I'm willing to merge this and resolve the conflict myself.

@thomcc

thomcc commented Jan 29, 2024

Copy link
Copy Markdown
Member

Sorry, I forgot to hit enter. I was going to say:

cc @thomcc what's your thought on this?

I don't have strong feelings, and am willing to leave the decision up to you.

But with your comment that it's a single conflicting PR, I think we should go for it.

@NobodyXu

Copy link
Copy Markdown
Contributor

There's also #907 (one-line change) and #851 (PR stale for a while).

So I will go ahead and merge it.

@NobodyXu NobodyXu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, but you would need to resolve merge conflicts before I can merge it

@Be-ing

Be-ing commented Jan 29, 2024

Copy link
Copy Markdown
Contributor Author

Merge conflict fixed.

@NobodyXu NobodyXu merged commit 3b046c5 into rust-lang:main Jan 30, 2024
@Be-ing Be-ing deleted the tool_mod branch January 30, 2024 04:18
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