Skip to content

Conversation

@yotamofek
Copy link
Contributor

@yotamofek yotamofek commented Nov 12, 2025

tidy will already install it (when needed) due to it being in package.json

With this change, we don't have the version of eslint specific in two different places :)

(this was added in #141705 , before tidy gained the ability to run npm install, and is not needed anymore)

`tidy` will already install it (when needed) due to it being in `package.json`
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Nov 12, 2025
@yotamofek
Copy link
Contributor Author

r? @Kobzol

cc @GuillaumeGomez

@yotamofek yotamofek marked this pull request as ready for review November 12, 2025 19:47
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 12, 2025
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Nov 12, 2025

Less code for same behaviour always makes me very happy. :)

@Kobzol
Copy link
Member

Kobzol commented Nov 12, 2025

Looks great, and tidy passed, so:

@bors r=Kobzol,GuillaumeGomez rollup

@bors
Copy link
Collaborator

bors commented Nov 12, 2025

📌 Commit c09185c has been approved by Kobzol,GuillaumeGomez

It is now in the queue for this repository.

@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 Nov 12, 2025
bors added a commit that referenced this pull request Nov 13, 2025
Rollup of 7 pull requests

Successful merges:

 - #147701 (rustdoc: don't ignore path distance for doc aliases)
 - #148735 (Fix ICE caused by invalid spans for shrink_file)
 - #148839 (fix rtsan_nonblocking_async lint closure ICE)
 - #148846 (add a test for combining RPIT with explicit tail calls)
 - #148872 (fix: Do not ICE when missing match arm with ill-formed subty is met)
 - #148880 (Remove explicit install of `eslint` inside of `tidy`'s Dockerfile)
 - #148883 (bootstrap: dont require cmake if local-rebuild is enabled)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3a4a738 into rust-lang:main Nov 13, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 13, 2025
rust-timer added a commit that referenced this pull request Nov 13, 2025
Rollup merge of #148880 - yotamofek:pr/dockerfile-eslint-install, r=Kobzol,GuillaumeGomez

Remove explicit install of `eslint` inside of `tidy`'s Dockerfile

`tidy` will already install it (when needed) due to it being in `package.json`

With this change, we don't have the version of `eslint` specific in two different places :)

(this was added in #141705 , before `tidy` gained the ability to run `npm install`, and is not needed anymore)
@yotamofek yotamofek deleted the pr/dockerfile-eslint-install branch November 13, 2025 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants