Skip to content

rustdoc: fix missing resource suffix on crates.js - #129641

Merged
bors merged 1 commit into
rust-lang:masterfrom
notriddle:notriddle/missing-crates-js-resource-suffix
Aug 28, 2024
Merged

rustdoc: fix missing resource suffix on crates.js#129641
bors merged 1 commit into
rust-lang:masterfrom
notriddle:notriddle/missing-crates-js-resource-suffix

Conversation

@notriddle

@notriddlenotriddle commented Aug 27, 2024

Copy link
Copy Markdown
Contributor

Fixes a regression introduced in #128252.

@rustbot

rustbot commented Aug 27, 2024

Copy link
Copy Markdown
Collaborator

r? @GuillaumeGomez

rustbot has assigned @GuillaumeGomez.
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-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 27, 2024
@rustbot

rustbot commented Aug 27, 2024

Copy link
Copy Markdown
Collaborator

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@notriddle
notriddleforce-pushed the notriddle/missing-crates-js-resource-suffix branch from ec7e313 to a1746b4CompareAugust 27, 2024 03:43
@GuillaumeGomez

GuillaumeGomez commented Aug 27, 2024

Copy link
Copy Markdown
Member

Could you add a test to ensure the suffix is present in tests/run-make for all rustdoc files please?

jieyouxu
jieyouxu reviewed Aug 27, 2024
View reviewed changes
Comment threadtests/run-make/emit-shared-files/rmake.rs

@jieyouxujieyouxuAug 27, 2024

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.

Suggestion: since this is a rustdoc-specific test, could we prefix this test name with rustdoc- or something?

@GuillaumeGomezGuillaumeGomezAug 27, 2024

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.

👍

@jieyouxujieyouxuAug 27, 2024•
edited
Loading

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.

(Context: there is a emit-to-stdout that we're porting in the neighbor PR #128460 which is exercising rustc only, which I am suggesting to rename to rustc-emit-to-stdout to make it less confusing)

@notriddle

notriddle commented Aug 27, 2024

Copy link
Copy Markdown
ContributorAuthor

Could you add a test to ensure the suffix is present in tests/run-make for all rustdoc files please?

How is what you’re adding for different from the test that’s already there?

@GuillaumeGomez

GuillaumeGomez commented Aug 27, 2024

Copy link
Copy Markdown
Member

Well apparently it's not working since it didn't catch this regression, so seems like either this test is incomplete or testing things incorrectly.

@notriddle

notriddle commented Aug 27, 2024

Copy link
Copy Markdown
ContributorAuthor

Yes, I know. I updated the test in this PR.

@GuillaumeGomez

GuillaumeGomez commented Aug 27, 2024

Copy link
Copy Markdown
Member

Yes, I know. I updated the test in this PR.

Ah indeed, missed it. Well done, thanks!

@bors r+ rollup

@bors

bors commented Aug 27, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit a1746b4 has been approved by GuillaumeGomez

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 Aug 27, 2024
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 28, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2024
@bors
Auto merge ofrust-lang#129691- matthiaskrgr:rollup-owlcr3m, r=matth…
c68d531
…iaskrgr
Rollup of 11 pull requests
Successful merges:
- rust-lang#129421 (add repr to the allowlist for naked functions)
- rust-lang#129480 (docs: correct panic conditions for rem_euclid and similar functions)
- rust-lang#129551 (ub_checks intrinsics: fall back to cfg(ub_checks))
- rust-lang#129608 (const-eval: do not make UbChecks behavior depend on current crate's flags)
- rust-lang#129613 (interpret: do not make const-eval query result depend on tcx.sess)
- rust-lang#129641 (rustdoc: fix missing resource suffix on `crates.js`)
- rust-lang#129657 (Rename `BikeshedIntrinsicFrom` to `TransmuteFrom`)
- rust-lang#129666 (interpret: add missing alignment check in raw_eq)
- rust-lang#129667 (Rustc driver cleanup)
- rust-lang#129668 (Fix Pin::set bounds regression)
- rust-lang#129686 (coverage: Rename `CodeRegion` to `SourceRegion`)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2024
@bors
Auto merge ofrust-lang#129691- matthiaskrgr:rollup-owlcr3m, r=matth…
100fde5
…iaskrgr
Rollup of 11 pull requests
Successful merges:
- rust-lang#129421 (add repr to the allowlist for naked functions)
- rust-lang#129480 (docs: correct panic conditions for rem_euclid and similar functions)
- rust-lang#129551 (ub_checks intrinsics: fall back to cfg(ub_checks))
- rust-lang#129608 (const-eval: do not make UbChecks behavior depend on current crate's flags)
- rust-lang#129613 (interpret: do not make const-eval query result depend on tcx.sess)
- rust-lang#129641 (rustdoc: fix missing resource suffix on `crates.js`)
- rust-lang#129657 (Rename `BikeshedIntrinsicFrom` to `TransmuteFrom`)
- rust-lang#129666 (interpret: add missing alignment check in raw_eq)
- rust-lang#129667 (Rustc driver cleanup)
- rust-lang#129668 (Fix Pin::set bounds regression)
- rust-lang#129686 (coverage: Rename `CodeRegion` to `SourceRegion`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 5725119 into rust-lang:masterAug 28, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2024
@rust-timer
Unrolled build forrust-lang#129641
07d572d
Rollup merge of rust-lang#129641 - notriddle:notriddle/missing-crates-js-resource-suffix, r=GuillaumeGomez
rustdoc: fix missing resource suffix on `crates.js`
Fixes a regression introduced in rust-lang#128252.
@notriddle
notriddle deleted the notriddle/missing-crates-js-resource-suffix branch August 28, 2024 20:23
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

A-run-makeArea: port run-make Makefiles to rmake.rsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

No open projects
Oxidizing run-make tests
Status: Done

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

6 participants

@notriddle@rustbot@rust-log-analyzer@GuillaumeGomez@bors@jieyouxu