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: Don't inline foreign traits #105182

Merged
merged 4 commits into from
Dec 3, 2022
Merged

Rustdoc-Json: Don't inline foreign traits #105182

merged 4 commits into from
Dec 3, 2022

Conversation

aDotInTheVoid
Copy link
Member

@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 Dec 2, 2022
@aDotInTheVoid aDotInTheVoid mentioned this pull request Dec 2, 2022
Closed
@Enselic
Copy link
Member

Enselic commented Dec 2, 2022

The foreign items will still be in paths, right? It looks like it from glancing at the code; just wanted to confirm.

@aDotInTheVoid
Copy link
Member Author

The foreign items will still be in paths, right? It looks like it from glancing at the code; just wanted to confirm.

Yep. If they weren't, jsondoclint would catch that as an error.

@GuillaumeGomez
Copy link
Member

Looks good to me, thanks! With the double-check of @Enselic, I think it's safe to go. :)

@bors r=Enselic,GuillaumeGomez rollup

@bors
Copy link
Contributor

bors commented Dec 2, 2022

📌 Commit 79d897b has been approved by Enselic,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 Dec 2, 2022
@JohnTitor JohnTitor mentioned this pull request Dec 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 3, 2022
@bors
Auto merge of rust-lang#105196 - JohnTitor:rollup-8rxqnq6, r=JohnTitor
24f2704 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#104903 (Use ocx.normalize in report_projection_error)
 - rust-lang#105032 (improve doc of into_boxed_slice and impl From<Vec<T>> for Box<[T]>)
 - rust-lang#105100 (Add missing intra-doc link)
 - rust-lang#105181 (Don't add a note for implementing a trait if its inner type is erroneous)
 - rust-lang#105182 (Rustdoc-Json: Don't inline foreign traits)
 - rust-lang#105188 (Don't elide type information when printing E0308 with `-Zverbose`)
 - rust-lang#105189 (rustdoc: clean up redundant CSS on `.rustdoc-toggle.hideme`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9afa850 into rust-lang:master Dec 3, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 3, 2022
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.67.0
5 participants
@aDotInTheVoid @Enselic @GuillaumeGomez @bors @rustbot