Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't apply editorconfig to llvm #136792

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Don't apply editorconfig to llvm #136792

merged 1 commit into from
Feb 10, 2025

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Feb 9, 2025

They use 2 spaces by default, not 4.

They use 2 spaces by default, not 4.
@rustbot
Copy link
Collaborator

rustbot commented Feb 9, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2025
@jyn514
Copy link
Member Author

jyn514 commented Feb 9, 2025

we might also want to suggest using the vscode plugin for editorconfig; right now it's ignored by default. our settings file probably shouldn't install it without prompting though.

@jieyouxu
Copy link
Member

I think llvm sub dir has its own formatting via ./x fmt extra checks, but anyway

r? jieyouxu @bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 10, 2025

📌 Commit df94005 has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned Mark-Simulacrum Feb 10, 2025
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 10, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
…kingjubilee

Rollup of 12 pull requests

Successful merges:

 - rust-lang#136053 (coverage: Defer part of counter-creation until codegen)
 - rust-lang#136201 (Removed dependency on the field-offset crate, alternate approach)
 - rust-lang#136228 (Simplify Rc::as_ptr docs + typo fix)
 - rust-lang#136353 (fix(libtest): Enable Instant on Emscripten targets)
 - rust-lang#136472 ([`compiletest`-related cleanups 2/7] Feed stage number to compiletest directly)
 - rust-lang#136487 (ci: stop mysql before removing it)
 - rust-lang#136552 (Use an `Option` for `FindNextFileHandle` in `ReadDir` instead of `INVALID_FILE_HANDLE` sentinel value)
 - rust-lang#136705 (Some miscellaneous edition-related library tweaks)
 - rust-lang#136707 (Bump `cc` to v1.2.13 for the compiler workspace)
 - rust-lang#136790 (Git blame ignore recent formatting commit)
 - rust-lang#136792 (Don't apply editorconfig to llvm)
 - rust-lang#136805 (ignore win_delete_self test in Miri)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3e5f489 into rust-lang:master Feb 10, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 10, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
Rollup merge of rust-lang#136792 - jyn514:editor-config, r=jieyouxu

Don't apply editorconfig to llvm

They use 2 spaces by default, not 4.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants