search

rust-vmm / vhost-device

'vhost-user' device backends workspace
Apache License 2.0
67 stars 46 forks source link

build(deps): bump the vhost-device group in /staging with 2 updates #675

Closed dependabot[bot] closed 2 months ago

dependabot[bot] commented 2 months ago

⚠️ Dependabot is rebasing this PR ⚠️

Rebasing might not happen immediately, so don't worry if this takes some time.

Note: if you make any changes to this PR yourself, they will take precedence over the rebase.

Bumps the vhost-device group in /staging with 2 updates: proc-macro2 and syn.

Updates proc-macro2 from 1.0.85 to 1.0.86

Release notes

Sourced from proc-macro2's releases.

1.0.86

  • Documentation improvements
Commits


Updates syn from 2.0.66 to 2.0.68

Release notes

Sourced from syn's releases.

2.0.68

  • Improve panic location when parse_quote! parses invalid syntax (#1690, thanks @​stepancheg)
  • More efficient peek implementation for Group and Lifetime (#1687)

2.0.67

  • Produce more accurate error message locations for errors located at the end of a nested group (#1679, #1680)
  • Support peeking LitCStr in ParseStream::peek (#1682)
Commits
  • ecb0429 Release 2.0.68
  • 37edbd2 Merge pull request #1690 from stepancheg/track-called
  • 4338772 track-caller in parse_quote_spanned
  • 537b0c5 Update test suite to nightly-2024-06-22
  • b088d5c Merge pull request #1688 from dtolnay/peeklit
  • 9b4e478 Relocate Lit peek impls into lit module
  • 38f2ddb Merge pull request #1687 from dtolnay/fastpeek
  • ef20bfd Optimize the peek impl of Group and Lifetime
  • 4b6c96a Merge pull request #1686 from dtolnay/isempty
  • 87d5792 Reword explanation of ParseBuffer::is_empty
  • Additional commits viewable in compare view


Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
epilys commented 2 months ago

@dependabot rebase

epilys commented 2 months ago

@dependabot rebase

stefano-garzarella commented 2 months ago

@dependabot rebase

vireshk commented 2 months ago

@dependabot rebase

Wondering why a rebase request from @stefano-garzarella and @epilys didn't work yet ? Maybe a recreate was required instead ?

I have clicked on Update branch now, which essentially creates a temporary merge. The temporary merge is ignored while applying though, as the merge strategy for the branch is rebase :)

Very confusing..

stefano-garzarella commented 2 months ago

@vireshk yeah, I was wondering the same, but I didn't do a manual rebase since I saw: ⚠️ Dependabot is rebasing this PR ⚠️ on top. Strange!

vireshk commented 2 months ago

@vireshk yeah, I was wondering the same, but I didn't do a manual rebase since I saw: ⚠️ Dependabot is rebasing this PR ⚠️ on top. Strange!

What do you mean by manual rebase here ? When we click on Update branch, it doesn't do a rebase, but a temporary merge.. That's all I do normally.. and then do the actual merge, which drops the temporary merge object.

stefano-garzarella commented 2 months ago

@vireshk yeah, I was wondering the same, but I didn't do a manual rebase since I saw: ⚠️ Dependabot is rebasing this PR ⚠️ on top. Strange!

What do you mean by manual rebase here ?

I usually do "Update branch by rebase" (or how it is called) for dependabot since I don't like merge commit in our history.

When we click on Update branch, it doesn't do a rebase, but a temporary merge.. That's all I do normally.. and then do the actual merge, which drops the temporary merge object.

Are you sure about that? I see a lot of merge commit in our history.

vireshk commented 2 months ago

I usually do "Update branch by rebase" (or how it is called) for dependabot since I don't like merge commit in our history.

Ahh, I never went inside that down button to see we can do update branch with rebase. Nice. :)

Are you sure about that? I see a lot of merge commit in our history.

Yes. That used to be the case earlier. I changed the strategy to Rebase a long time back. For any open pull request you can see at the bottom: Enable auto-merge (Rebase), which shows the default strategy..

Even for this pull request, you can see it has two commits, one is the real update, one is temporary merge created by me. But see the main branch now, it only has the real change (with a different sha id as it got rebased), but doesn't have my merge anymore.

stefano-garzarella commented 2 months ago

@vireshk okay, I see now, so you do the "normal" update first (with the merge) and then you do the PR merge with the rebase which obviously removes the merge commit. Right?

Should we also set the default policy to rebase for the Update? (if possible)

vireshk commented 2 months ago

@vireshk okay, I see now, so you do the "normal" update first (with the merge) and then you do the PR merge with the rebase which obviously removes the merge commit. Right?

Yes.

Should we also set the default policy to rebase for the Update? (if possible)

We can if there is a way.

epilys commented 2 months ago

I merged another dependabot PR and then asked for a rebase here right away, the lack of adequate delay/wait between the two may have triggered a bug.

stefano-garzarella commented 2 months ago

I merged another dependabot PR and then asked for a rebase here right away, the lack of adequate delay/wait between the two may have triggered a bug.

mmm, it could be, but I usually do this all the time, although lately I do Update with rebase and then activate auto-merge to do it faster and not forget.