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-Json: Retain Stripped Modules when they are imported, not when they have items #101106

Merged
merged 2 commits into from
Aug 30, 2022
Merged

Rustdoc-Json: Retain Stripped Modules when they are imported, not when they have items #101106

merged 2 commits into from
Aug 30, 2022

Conversation

aDotInTheVoid
Copy link
Member

@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 28, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 28, 2022
@GuillaumeGomez
Copy link
Member

Apart a little missing documentation (very useful for anyone who comes reading this part of the code), looks all good to me!

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 28, 2022

📌 Commit 785101d 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 28, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#101106 - aDotInTheVoid:rdj-stripped-mod, r=…
b7b98e2 
…GuillaumeGomez

Rustdoc-Json: Retain Stripped Modules when they are imported, not when they have items

Fixes rust-lang#101103
Fixes rust-lang#100973

r? `@GuillaumeGomez`
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#101106 - aDotInTheVoid:rdj-stripped-mod, r=…
4bca52c 
…GuillaumeGomez

Rustdoc-Json: Retain Stripped Modules when they are imported, not when they have items

Fixes rust-lang#101103
Fixes rust-lang#100973

r? ``@GuillaumeGomez``
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r- failed in a rollup
#101136 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 28, 2022
@aDotInTheVoid
Copy link
Member Author

error

 Documenting rustdoc v0.0.0 (/checkout/src/librustdoc)
error: this URL is not a hyperlink
  --> src/librustdoc/json/import_finder.rs:14:9
   |
14 | /// See https://github.com/rust-lang/rust/issues/100973 and
   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use an automatic link instead: `<https://github.com/rust-lang/rust/issues/100973>`
   |
   = note: `-D rustdoc::bare-urls` implied by `-D warnings`
   = note: bare URLs are not automatically turned into clickable links

error: this URL is not a hyperlink
  --> src/librustdoc/json/import_finder.rs:15:5
   |
15 | /// https://github.com/rust-lang/rust/issues/101103 for times when this
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use an automatic link instead: `<https://github.com/rust-lang/rust/issues/101103>`
   |
   = note: bare URLs are not automatically turned into clickable links

@aDotInTheVoid
Copy link
Member Author

@rustbot ready

@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 Aug 28, 2022
@GuillaumeGomez
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 29, 2022

📌 Commit 891ebf9 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 29, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 29, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 29, 2022
@bors
Auto merge of rust-lang#101167 - matthiaskrgr:rollup-yt3jdmp, r=matth…
9f4d5d2 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#100898 (Do not report too many expr field candidates)
 - rust-lang#101056 (Add the syntax of references to their documentation summary.)
 - rust-lang#101106 (Rustdoc-Json: Retain Stripped Modules when they are imported, not when they have items)
 - rust-lang#101131 (CTFE: exposing pointers and calling extern fn is just impossible)
 - rust-lang#101141 (Simplify `get_trait_ref` fn used for `virtual_function_elimination`)
 - rust-lang#101146 (Various changes to logging of borrowck-related code)
 - rust-lang#101156 (Remove `Sync` requirement from lint pass objects)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ecd908a into rust-lang:master Aug 30, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 30, 2022
@aDotInTheVoid aDotInTheVoid mentioned this pull request Aug 30, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

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
Milestone
1.65.0
6 participants
@aDotInTheVoid @GuillaumeGomez @bors @matthiaskrgr @rust-highfive @rustbot