Skip to content

Formatter should not try to format non-Rust files - #106263

Merged
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:yukang/fix-106261-formater
Dec 29, 2022
Merged

Formatter should not try to format non-Rust files#106263
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:yukang/fix-106261-formater

Conversation

@chenyukang

@chenyukangchenyukang commented Dec 29, 2022

Copy link
Copy Markdown
Member

Fixes#106261

@rustbot

rustbot commented Dec 29, 2022

Copy link
Copy Markdown
Collaborator

r? @jyn514

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2022
albertlarsan68
albertlarsan68 reviewed Dec 29, 2022
View reviewed changes
Comment threadsrc/bootstrap/format.rs Outdated
jyn514
jyn514 approved these changes Dec 29, 2022
View reviewed changes

@jyn514jyn514 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! r=me with @albertlarsan68's comment fixed.

@chenyukang
chenyukangforce-pushed the yukang/fix-106261-formater branch from 5e34937 to 7ebcc78CompareDecember 29, 2022 16:00
@chenyukang

chenyukang commented Dec 29, 2022

Copy link
Copy Markdown
MemberAuthor

@bors r=jyn514

@bors

bors commented Dec 29, 2022

Copy link
Copy Markdown
Collaborator

@chenyukang: 🔑 Insufficient privileges: Not in reviewers

@Noratrieb

Noratrieb commented Dec 29, 2022

Copy link
Copy Markdown
Member

@bors r=jyn514

@bors

bors commented Dec 29, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 7ebcc78 has been approved by jyn514

It is now in the queue for this repository.

@borsbors 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 Dec 29, 2022
@jyn514

jyn514 commented Dec 29, 2022

Copy link
Copy Markdown
Member

@bors rollup p=1

@jyn514jyn514 changed the title Formater should not try to format non-Rust filesFormatter should not try to format non-Rust filesDec 29, 2022
@matthiaskrgrmatthiaskrgr mentioned this pull request Dec 29, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2022
@bors
Auto merge ofrust-lang#106266- matthiaskrgr:rollup-cxrdbzy, r=matth…
ad8ae05
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params)
- rust-lang#105899 (`./x doc library --open` opens `std`)
- rust-lang#106190 (Account for multiple multiline spans with empty padding)
- rust-lang#106202 (Trim more paths in obligation types)
- rust-lang#106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing)
- rust-lang#106236 (docs/test: add docs and a UI test for `E0514` and `E0519`)
- rust-lang#106259 (Update Clippy)
- rust-lang#106260 (Fix index out of bounds issues in rustdoc)
- rust-lang#106263 (Formatter should not try to format non-Rust files)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 65fb703 into rust-lang:masterDec 29, 2022
@rustbotrustbot added this to the 1.68.0 milestone Dec 29, 2022
@bors

bors commented Dec 29, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7ebcc78 with merge ad8ae05...

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge ofrust-lang#106266- matthiaskrgr:rollup-cxrdbzy, r=matth…
972e531
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params)
- rust-lang#105899 (`./x doc library --open` opens `std`)
- rust-lang#106190 (Account for multiple multiline spans with empty padding)
- rust-lang#106202 (Trim more paths in obligation types)
- rust-lang#106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing)
- rust-lang#106236 (docs/test: add docs and a UI test for `E0514` and `E0519`)
- rust-lang#106259 (Update Clippy)
- rust-lang#106260 (Fix index out of bounds issues in rustdoc)
- rust-lang#106263 (Formatter should not try to format non-Rust files)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 12, 2023
@bors
Auto merge ofrust-lang#106266- matthiaskrgr:rollup-cxrdbzy, r=matth…
cd579d6
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params)
- rust-lang#105899 (`./x doc library --open` opens `std`)
- rust-lang#106190 (Account for multiple multiline spans with empty padding)
- rust-lang#106202 (Trim more paths in obligation types)
- rust-lang#106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing)
- rust-lang#106236 (docs/test: add docs and a UI test for `E0514` and `E0519`)
- rust-lang#106259 (Update Clippy)
- rust-lang#106260 (Fix index out of bounds issues in rustdoc)
- rust-lang#106263 (Formatter should not try to format non-Rust files)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@albertlarsan68albertlarsan68albertlarsan68 left review comments
+1 more reviewer
@jyn514jyn514jyn514 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@jyn514jyn514

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.68.0

Development

Successfully merging this pull request may close these issues.

x fmt tries to format non-rust files

6 participants

@chenyukang@rustbot@bors@Noratrieb@jyn514@albertlarsan68