Skip to content

Conversation

GuillaumeGomez
Copy link
Member

I extracted this commit from #113574.

When I added the test, it kept saying that the JSON file couldn't be found. After investigating for a while, I discovered that we were expecting files to always use _, which is quite bad. So I added support for - in file names.

r? @notriddle

@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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 Jul 12, 2023
@notriddle
Copy link
Contributor

Sure. Makes sense.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 12, 2023

📌 Commit 18457ea has been approved by notriddle

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 Jul 12, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 12, 2023
…name, r=notriddle

Allow to have `-` in rustdoc-json test file name

I extracted this commit from rust-lang#113574.

When I added the test, it kept saying that the JSON file couldn't be found. After investigating for a while, I discovered that we were expecting files to always use `_`, which is quite bad. So I added support for `-` in file names.

r? `@notriddle`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 13, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113353 (Implement selection for `Unsize` for better coercion behavior)
 - rust-lang#113553 (Make Placeholder, GeneratorWitness*, Infer and Error unreachable on SMIR rustc_ty_to_ty)
 - rust-lang#113598 (Update cargo)
 - rust-lang#113603 (Test simd-wide-sum for codegen error)
 - rust-lang#113613 (Allow to have `-` in rustdoc-json test file name)
 - rust-lang#113615 (llvm-wrapper: adapt for LLVM API change)
 - rust-lang#113616 (Fix bootstrap.py uname error)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 253a4ca into rust-lang:master Jul 13, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 13, 2023
@GuillaumeGomez GuillaumeGomez deleted the allow-dash-in-file-name branch July 13, 2023 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend 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
None yet
Development

Successfully merging this pull request may close these issues.

4 participants