Skip to content

style: rename crates to kebab-case#12118

Merged
bors merged 6 commits into
rust-lang:masterfrom
mehdiakiki:fix#12102
May 1, 2022
Merged

style: rename crates to kebab-case#12118
bors merged 6 commits into
rust-lang:masterfrom
mehdiakiki:fix#12102

Conversation

@mehdiakiki

Copy link
Copy Markdown
Contributor

Ref: #12102
I updated all the folders names as well as the crates names in each Cargo.toml to use kebab-case.

This is my first ra PR. In case I missed something, I am ready/available to fix it until it is ready to merge.

Thank you.

@lnicola

lnicola commented Apr 29, 2022

Copy link
Copy Markdown
Member

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

@mehdiakiki

Copy link
Copy Markdown
Contributor Author

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

@lnicola

lnicola commented Apr 29, 2022

Copy link
Copy Markdown
Member

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

@lnicola

lnicola commented Apr 29, 2022

Copy link
Copy Markdown
Member

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

@jonas-schievink

Copy link
Copy Markdown
Contributor

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

@mehdiakiki

Copy link
Copy Markdown
Contributor Author

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 :)

@lnicola

lnicola commented Apr 30, 2022

Copy link
Copy Markdown
Member

@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?

@mehdiakiki

mehdiakiki commented Apr 30, 2022

Copy link
Copy Markdown
Contributor Author

@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.

@lnicola

lnicola commented May 1, 2022

Copy link
Copy Markdown
Member

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+

@bors

bors commented May 1, 2022

Copy link
Copy Markdown
Contributor

✌️ @randomicon00 can now approve this pull request

@bors

bors commented May 1, 2022

Copy link
Copy Markdown
Contributor

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

@mehdiakiki

Copy link
Copy Markdown
Contributor Author

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?

@lnicola

lnicola commented May 1, 2022

Copy link
Copy Markdown
Member

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

@mehdiakiki

Copy link
Copy Markdown
Contributor Author

all tests are passing. @bors r=lnicola

@bors

bors commented May 1, 2022

Copy link
Copy Markdown
Contributor

📌 Commit aade319 has been approved by lnicola

@bors

bors commented May 1, 2022

Copy link
Copy Markdown
Contributor

⌛ Testing commit aade319 with merge 5c88d93...

@bors

bors commented May 1, 2022

Copy link
Copy Markdown
Contributor

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

@Veykril

Veykril commented May 1, 2022

Copy link
Copy Markdown
Member

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

@lnicola

lnicola commented May 2, 2022

Copy link
Copy Markdown
Member

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

image

@mehdiakiki

mehdiakiki commented May 2, 2022

Copy link
Copy Markdown
Contributor Author

Good morning! I squashed the last 6 commits.

@pksunkara

Copy link
Copy Markdown
Contributor

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.

@Veykril

Veykril commented May 22, 2022

Copy link
Copy Markdown
Member

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

@pksunkara

Copy link
Copy Markdown
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants