Skip to content

Conversation

JohnTitor
Copy link
Member

We use 2 spaces as an indent on YAML like .travis.yml now but .editorconfig tells my editor that indent size is 4, not 2. It makes my editor confused.

changelog: none

@phansch
Copy link
Contributor

phansch commented Jan 9, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jan 9, 2020

📌 Commit 9a008e2 has been approved by phansch

@bors
Copy link
Contributor

bors commented Jan 9, 2020

⌛ Testing commit 9a008e2 with merge 3f7358a...

bors added a commit that referenced this pull request Jan 9, 2020
Prefer 2 spaces as indent size over 4 on yaml

We use 2 spaces as an indent on YAML like `.travis.yml` now but `.editorconfig` tells my editor that indent size is 4, not 2. It makes my editor confused.

changelog: none
@bors
Copy link
Contributor

bors commented Jan 9, 2020

💔 Test failed - checks-travis

@JohnTitor
Copy link
Member Author

JohnTitor commented Jan 9, 2020

It's spurious: https://travis-ci.com/rust-lang/rust-clippy/jobs/274025414

@phansch
Copy link
Contributor

phansch commented Jan 9, 2020

@bors retry (failed to unpack)

@bors
Copy link
Contributor

bors commented Jan 9, 2020

⌛ Testing commit 9a008e2 with merge 43ac941...

bors added a commit that referenced this pull request Jan 9, 2020
Prefer 2 spaces as indent size over 4 on yaml

We use 2 spaces as an indent on YAML like `.travis.yml` now but `.editorconfig` tells my editor that indent size is 4, not 2. It makes my editor confused.

changelog: none
@bors
Copy link
Contributor

bors commented Jan 9, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing 43ac941 to master...

@bors bors merged commit 9a008e2 into rust-lang:master Jan 9, 2020
@JohnTitor JohnTitor deleted the editorconfig branch January 9, 2020 22:25
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.

3 participants