Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 28, 2024
Merged

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

merged 1 commit into from
Aug 28, 2024
+16 −9

Conversation

notriddle
Copy link
Contributor

Fixes a regression introduced in #128252.

@rustbot
Copy link
Collaborator

rustbot commented Aug 27, 2024

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

@rustbot rustbot 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
Copy link
Collaborator

rustbot commented Aug 27, 2024

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 notriddle force-pushed the notriddle/missing-crates-js-resource-suffix branch from ec7e313 to a1746b4 Compare August 27, 2024 03:43
@GuillaumeGomez
Copy link
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
tests/run-make/emit-shared-files/rmake.rs
Copy link
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?

Copy link
Member

Choose a reason for hiding this comment

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

👍

Copy link
Member

@jieyouxu jieyouxu Aug 27, 2024 •
edited
Loading

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
Copy link
Contributor Author

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
Copy link
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
Copy link
Contributor Author

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

@GuillaumeGomez
Copy link
Member

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

Ah indeed, missed it. Well done, thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 27, 2024

📌 Commit a1746b4 has been approved by 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 Aug 27, 2024
@matthiaskrgr matthiaskrgr 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 of rust-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 of rust-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:master Aug 28, 2024
6 checks passed
@rustbot rustbot 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 for rust-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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
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