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: Use Function everywhere and remove Method #104499

Merged
merged 2 commits into from
Nov 21, 2022
Merged

rustdoc JSON: Use Function everywhere and remove Method #104499

merged 2 commits into from
Nov 21, 2022

Conversation

Enselic
Copy link
Member

@Enselic Enselic commented Nov 16, 2022

Closes #100259

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2022

r? @GuillaumeGomez

(rustbot has picked a reviewer for you, use r? to override)

@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 Nov 16, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 2022

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

@GuillaumeGomez
Copy link
Member

Code changes look good to me. In the issue it's mentioned that documentation should reflect this. Please add it then it's good to go.

@Enselic
Copy link
Member Author

Enselic commented Nov 20, 2022

@GuillaumeGomez Thanks for review! I think I addressed your comment now.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 21, 2022

📌 Commit 30b7e44 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 Nov 21, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#104499 - Enselic:no-method-in-rustdoc-json,…
351731d 
… r=GuillaumeGomez

rustdoc JSON: Use `Function` everywhere and remove `Method`

Closes rust-lang#100259
This was referenced Nov 21, 2022
Closed
Merged
@aDotInTheVoid aDotInTheVoid mentioned this pull request Nov 21, 2022
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2022
@bors
Auto merge of rust-lang#104673 - matthiaskrgr:rollup-85f65ov, r=matth…
1cbc459 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#104420 (Fix doc example for `wrapping_abs`)
 - rust-lang#104499 (rustdoc JSON: Use `Function` everywhere and remove `Method`)
 - rust-lang#104500 (`rustc_ast`: remove `ref` patterns)
 - rust-lang#104511 (Mark functions created for `raw-dylib` on x86 with DllImport storage class)
 - rust-lang#104595 (Add `PolyExistentialPredicate` type alias)
 - rust-lang#104605 (deduplicate constant evaluation in cranelift backend)
 - rust-lang#104628 (Revert "Update CI to use Android NDK r25b")
 - rust-lang#104662 (Streamline deriving on packed structs.)
 - rust-lang#104667 (Revert formatting changes of a test)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4300b9e into rust-lang:master Nov 21, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 21, 2022
aDotInTheVoid added a commit to rust-lang/rustdoc-types that referenced this pull request Nov 21, 2022
@aDotInTheVoid
v0.19.0
1e078f7 
rust-lang/rust#104499
rust-lang/rust#104349
rust-lang/rust#103664
@Enselic Enselic mentioned this pull request Nov 21, 2022
Merged
@Enselic Enselic deleted the no-method-in-rustdoc-json branch November 23, 2022 18:17
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
Development

Successfully merging this pull request may close these issues.

Get rid of the distinction between method and function in rustdoc JSON output
4 participants
@Enselic @rustbot @GuillaumeGomez @bors