Can you rebase? It seems there's a conflict on one file.

Yes, I can. My current branch doesn't include the latest 4 changes.

Great. We can't merge this because one of the newer changes touches a file in ide_db, which you've renamed.

changelog internal (first contribution) rename crates to kebab-case

Looks like you rebased master onto your branch, not your branch onto master

Yes, as I rarely use rebase, I've made the mistake and instantly regretted it. I secretly hoped it will go away (this trick never works btw). It came back to haunt me through your message @jonas-schievink :)

@randomicon00 I think there's still a failing test that checks that a generated file is up to date. Do you need help with this?

@lnicola I will have a look at it tonight or tomorrow morning and let you know. The test that fails is tests::sourcegen::source_genassists_docs in ide-assists crate. Currently updating the crates names in tests that fail.

Looks good. If it's not too much of a hassle, can you do a final squash to get rid of the swapfile?

@bors delegate+

✌️ @randomicon00 can now approve this pull request

☔ The latest upstream changes (presumably #12099) made this pull request unmergeable. Please resolve the merge conflicts.

As much as the task is trivial, as much as branch conflits seem to keep rolling!
@lnicola what would be, please, the best approach to resolve these conflicts?

I would squash, then rebase and fix the conflicts. Then merge it without waiting for a review (leave a comment with @ bors r=lnicola).

all tests are passing. @bors r=lnicola

📌 Commit aade319 has been approved by lnicola

⌛ Testing commit aade319 with merge 5c88d93...

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 5c88d93 to master...

Good thing we only had ~20 open PRs and not more 😅

Nope, looks like you didn't actually squash the changes 😄

Good morning! I squashed the last 6 commits.

This broke the publish action as you can see by https://github.com/rust-lang/rust-analyzer/runs/6524727008?check_suite_focus=true#step:5:223. cc @jonas-schievink

I am not sure why this change was made.

This change was made for consistency, we had some crates using kebab-case and some using snake_case before.

So, how do we fix the old crates being named with _? Crates.io is not allowing us to publish with -, I think.