Skip to content

tidy: Distinguish between two different meanings of "style file" - #133405

Merged
bors merged 1 commit into
rust-lang:masterfrom
Zalathar:style-file
Nov 24, 2024
Merged

tidy: Distinguish between two different meanings of "style file"#133405
bors merged 1 commit into
rust-lang:masterfrom
Zalathar:style-file

Conversation

@Zalathar

@ZalatharZalathar commented Nov 24, 2024

Copy link
Copy Markdown
Member

This file contains code that uses “style file” to mean “CSS file”, and other code that uses “style file” to mean “this file, which implements the style checker”.

That's very confusing, so it's easier to just say CSS file or this file as appropriate.

No functional change.

@rustbot

Copy link
Copy Markdown
Collaborator

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

@rustbotrustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 24, 2024
@jieyouxu

Copy link
Copy Markdown
Member

r? jieyouxu

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

@jieyouxu

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Nov 24, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 2134a7e has been approved by jieyouxu

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 Nov 24, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 24, 2024
…iaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#133300 (inject_panic_runtime(): Avoid double negation for 'any non rlib')
- rust-lang#133301 (Add code example for `wrapping_neg` method for signed integers)
- rust-lang#133371 (remove is_trivially_const_drop)
- rust-lang#133389 (Stabilize `const_float_methods`)
- rust-lang#133398 (rustdoc: do not call to_string, it's already impl Display)
- rust-lang#133405 (tidy: Distinguish between two different meanings of "style file")
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 3ccacef into rust-lang:masterNov 24, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 24, 2024
Rollup merge of rust-lang#133405 - Zalathar:style-file, r=jieyouxu
tidy: Distinguish between two different meanings of "style file"
This file contains code that uses “style file” to mean “CSS file”, and other code that uses “style file” to mean “this file, which implements the style checker”.
That's very confusing, so it's easier to just say *CSS file* or *this file* as appropriate.
No functional change.
@rustbotrustbot added this to the 1.85.0 milestone Nov 24, 2024
@Zalathar
Zalathar deleted the style-file branch November 24, 2024 13:17
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcS-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

Development

Successfully merging this pull request may close these issues.

5 participants

@Zalathar@rustbot@jieyouxu@bors@Mark-Simulacrum