Stream: t-compiler/rust-analyzer

Topic: bors


Phil Ellison (Jan 07 2021 at 18:59, on Zulip):

https://github.com/rust-analyzer/rust-analyzer/pull/7097

What does bors actually do here? After this PR was r+-ed it ran tests and complained that the new test in my PR wasn't using $0 to indicate the cursor position. This makes sense - my PR pre-dated that change. However, I'm not sure what to do about it - there are no merge commits on the PR itself. I've tried pushing a change to update just the cursor indicator in the newly added test, but this results in the tests failing and complaining that the _old_ cursor style isn't present.

What's the current workflow here?

Jonas Schievink [he/him] (Jan 07 2021 at 19:00, on Zulip):

Try rebasing the PR onto current master

Lukas Wirth (Jan 07 2021 at 19:00, on Zulip):

^

Lukas Wirth (Jan 07 2021 at 19:00, on Zulip):

The tests are failing cause your branch expects <|> still, bors tests your changes on top of master though which expects $0

Phil Ellison (Jan 07 2021 at 19:02, on Zulip):

Thanks both. I've rebased and force pushed

Last update: Jul 27 2021 at 21:30UTC