search

rust-lang / miri

An interpreter for Rust's mid-level intermediate representation
Apache License 2.0
4.14k stars 318 forks source link

Follow up PR for eventfd shim #3661

Closed tiif closed 3 weeks ago

tiif commented 3 weeks ago

Follow up of https://github.com/rust-lang/miri/pull/3650

tiif commented 3 weeks ago

@rustbot ready

RalfJung commented 3 weeks ago

Looks good, thanks. :) There's no need to rebase when there are no conflicts, and github is terrible at dealing with force-pushes, so please only do that when needed.

Please squash.

RalfJung commented 3 weeks ago

Hm, that force-push has a non-empty diff? Did you do squash+rebase?

RalfJung commented 3 weeks ago

PR looks the same though. For reviewing it's easier if you don't do rebase unless needed -- including for the final squash; ideally you'll rebase that over the commit the branch is based on, not the latest upstream master. (One day maybe github can do git-range-diff, but until then we'll all spend a lot of time working around this...)

@bors r+

bors commented 3 weeks ago

:pushpin: Commit 194a7d3f8b52f1baf210f8e4d2e46f235a69b614 has been approved by RalfJung

It is now in the queue for this repository.

bors commented 3 weeks ago

:hourglass: Testing commit 194a7d3f8b52f1baf210f8e4d2e46f235a69b614 with merge 1eb9baee66df09f2f3a45a9effcbcf7eb8396087...

tiif commented 3 weeks ago

Ah I see. I did rebase on upstream before squash, will prevent doing that next time.

bors commented 3 weeks ago

:sunny: Test successful - checks-actions Approved by: RalfJung Pushing 1eb9baee66df09f2f3a45a9effcbcf7eb8396087 to master...