search

linebender / druid

A data-first Rust-native UI design toolkit.
https://linebender.org/druid/
Apache License 2.0
9.52k stars 568 forks source link

Update xilem_tokio branch from master #2357

Closed azymohliad closed 1 year ago

azymohliad commented 1 year ago

Besides just merging master into xilem_tokio, I only updated the usage of druid_shell::menu::Menu::add_item (commit), as its signature has slightly changed. Xilem examples seem to work well.

azymohliad commented 1 year ago

Thank you @raphlinus! So should I just merge it myself?

xStrom commented 1 year ago

Yeah the way we do it is that once a PR is approved, the author gets to choose whether they want to do additional changes in the PR or if it's time to merge.

Generally I would advise the Squash and merge button for merging into master, but this here is a different kind of PR so I guess the more standard merge that retains the individual commits is in order.

raphlinus commented 1 year ago

Yes, our usual pattern is for the author to merge. (This gives an opportunity for a final check, in case the author feels like there might be another change needed before actually merging)